Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Update dependencies related to security issues #109

Merged
merged 3 commits into from
Jun 19, 2024
Merged

⬆️ Update dependencies related to security issues #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a2fab2
⬆️ Update dependencies related to security issues
Viicos May 28, 2024
87ee2a5
Apply new black formatting changes
Viicos May 29, 2024
0c88087
Ignore formatting changes in git blame
Viicos May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Black formatting:
5fbfa94eed95297e7d48770efd66a1d2e143637d
068735e81ac630bc5a09d8c834aebe5c52e6d3ee
c43ce96282a52350ce757d854ac474894fcaa17b
14 changes: 7 additions & 7 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ boltons==23.0.0
# via
# face
# glom
cbor2==5.6.1
cbor2==5.6.3
# via webauthn
celery==5.2.7
# via
# flower
# notifications-api-common
# open-api-framework
certifi==2023.5.7
certifi==2024.2.2
# via
# elastic-apm
# requests
Expand All @@ -62,7 +62,7 @@ coreapi==2.3.3
# via commonground-api-common
coreschema==0.0.4
# via coreapi
cryptography==42.0.2
cryptography==42.0.7
# via
# django-simple-certmanager
# josepy
Expand Down Expand Up @@ -205,7 +205,7 @@ glom==23.3.0
# via mozilla-django-oidc-db
humanize==4.9.0
# via flower
idna==3.4
idna==3.7
# via requests
inflection==0.5.1
# via
Expand All @@ -217,7 +217,7 @@ isodate==0.6.1
# via commonground-api-common
itypes==1.2.0
# via coreapi
jinja2==3.1.2
jinja2==3.1.4
# via coreschema
josepy==1.13.0
# via mozilla-django-oidc
Expand Down Expand Up @@ -312,7 +312,7 @@ six==1.16.0
# orderedmultidict
# python-dateutil
# qrcode
sqlparse==0.4.4
sqlparse==0.5.0
# via django
tornado==6.4
# via flower
Expand All @@ -323,7 +323,7 @@ uritemplate==4.1.1
# coreapi
# drf-spectacular
# drf-yasg
urllib3==1.26.15
urllib3==2.2.1
# via
# elastic-apm
# requests
Expand Down
14 changes: 7 additions & 7 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ boltons==23.0.0
# -r requirements/base.txt
# face
# glom
cbor2==5.6.1
cbor2==5.6.3
# via
# -r requirements/base.txt
# webauthn
Expand All @@ -55,7 +55,7 @@ celery==5.2.7
# flower
# notifications-api-common
# open-api-framework
certifi==2023.5.7
certifi==2024.2.2
# via
# -r requirements/base.txt
# elastic-apm
Expand Down Expand Up @@ -102,7 +102,7 @@ coreschema==0.0.4
# coreapi
coverage==4.5.4
# via -r requirements/test-tools.in
cryptography==42.0.2
cryptography==42.0.7
# via
# -r requirements/base.txt
# django-simple-certmanager
Expand Down Expand Up @@ -320,7 +320,7 @@ humanize==4.9.0
# via
# -r requirements/base.txt
# flower
idna==3.4
idna==3.7
# via
# -r requirements/base.txt
# requests
Expand All @@ -341,7 +341,7 @@ itypes==1.2.0
# via
# -r requirements/base.txt
# coreapi
jinja2==3.1.2
jinja2==3.1.4
# via
# -r requirements/base.txt
# coreschema
Expand Down Expand Up @@ -500,7 +500,7 @@ six==1.16.0
# requests-mock
soupsieve==2.4.1
# via beautifulsoup4
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -r requirements/base.txt
# django
Expand All @@ -520,7 +520,7 @@ uritemplate==4.1.1
# coreapi
# drf-spectacular
# drf-yasg
urllib3==1.26.15
urllib3==2.2.1
# via
# -r requirements/base.txt
# elastic-apm
Expand Down
17 changes: 9 additions & 8 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ billiard==3.6.4.0
# via
# -r requirements/ci.txt
# celery
black==23.3.0
black==24.4.2
# via -r requirements/dev.in
bleach==6.1.0
# via
Expand All @@ -59,7 +59,7 @@ bump2version==1.0.1
# via bumpversion
bumpversion==0.6.0
# via -r requirements/dev.in
cbor2==5.6.1
cbor2==5.6.3
# via
# -r requirements/ci.txt
# webauthn
Expand All @@ -69,7 +69,7 @@ celery==5.2.7
# flower
# notifications-api-common
# open-api-framework
certifi==2023.5.7
certifi==2024.2.2
# via
# -r requirements/ci.txt
# elastic-apm
Expand Down Expand Up @@ -118,7 +118,7 @@ coreschema==0.0.4
# coreapi
coverage==4.5.4
# via -r requirements/ci.txt
cryptography==42.0.2
cryptography==42.0.7
# via
# -r requirements/ci.txt
# django-simple-certmanager
Expand Down Expand Up @@ -352,7 +352,7 @@ humanize==4.9.0
# via
# -r requirements/ci.txt
# flower
idna==3.4
idna==3.7
# via
# -r requirements/ci.txt
# requests
Expand All @@ -377,7 +377,7 @@ itypes==1.2.0
# via
# -r requirements/ci.txt
# coreapi
jinja2==3.1.2
jinja2==3.1.4
# via
# -r requirements/ci.txt
# coreschema
Expand Down Expand Up @@ -586,7 +586,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -r requirements/ci.txt
# django
Expand All @@ -604,14 +604,15 @@ tornado==6.4
typing-extensions==4.11.0
# via
# -r requirements/ci.txt
# black
# zgw-consumers
uritemplate==4.1.1
# via
# -r requirements/ci.txt
# coreapi
# drf-spectacular
# drf-yasg
urllib3==1.26.15
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@annashamray do you remember why urllib3 was pinned to 1.26.15 in 170dd77? Is it still relevant?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I had problems with OpenSSL and urllib3 2.0, and some github issue advised me to downgrade urllib3 and it fixed the problem. If you don't have import errors with openssl, then it should be fine

urllib3==2.2.1
# via
# -r requirements/ci.txt
# elastic-apm
Expand Down
1 change: 1 addition & 0 deletions src/objecttypes/conf/ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Continuous integration settings module.
"""

import logging
import os

Expand Down
1 change: 1 addition & 0 deletions src/objecttypes/conf/staging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

This *should* be nearly identical to production.
"""

import os

os.environ.setdefault("ENVIRONMENT", "staging")
Expand Down
1 change: 1 addition & 0 deletions src/objecttypes/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
do NOT import anything Django related here, as this file needs to be loaded
before Django is initialized.
"""

import os

from dotenv import load_dotenv
Expand Down
8 changes: 5 additions & 3 deletions src/objecttypes/utils/autoschema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ def get_parent_path_headers(self) -> list:
type=UUID if "uuid" in path_param else str,
location=OpenApiParameter.PATH,
required=True,
description=_("Unique identifier (UUID4)")
if "uuid" in path_param
else _("Unique identifier"),
description=(
_("Unique identifier (UUID4)")
if "uuid" in path_param
else _("Unique identifier")
),
)
for path_param in path_params
]
Expand Down
1 change: 1 addition & 0 deletions src/objecttypes/wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
For more information on this file, see
https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/
"""

import os

from django.core.wsgi import get_wsgi_application
Expand Down
Loading