Merge branch 'master' into issue/django-setup-configuration-mozilla-d…

…jango-oidc-db
maykinmedia · Dec 13, 2024 · 0b13d7e · 0b13d7e
2 parents 7ebced9 + 6fb512e
commit 0b13d7e
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 94 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -244,10 +244,8 @@ maykin-2fa==1.0.1
     # via open-api-framework
 mozilla-django-oidc==4.0.0
     # via mozilla-django-oidc-db
-mozilla-django-oidc-db[django-setup-configuration]==0.21.1
-    # via
-    #   -r requirements/base.in
-    #   open-api-framework
+mozilla-django-oidc-db==0.19.0
+    # via open-api-framework
 notifications-api-common==0.3.1
     # via commonground-api-common
 open-api-framework==0.9.0
@@ -268,11 +266,11 @@ psycopg2==2.9.9
     # via open-api-framework
 pycparser==2.21
     # via cffi
-pydantic==2.10.3
+pydantic==2.9.2
     # via
     #   django-setup-configuration
     #   pydantic-settings
-pydantic-core==2.27.1
+pydantic-core==2.23.4
     # via pydantic
 pydantic-settings[yaml]==2.6.1
     # via django-setup-configuration
@@ -340,7 +338,7 @@ sqlparse==0.5.0
     # via django
 tornado==6.4.1
     # via flower
-typing-extensions==4.12.2
+typing-extensions==4.11.0
     # via
     #   mozilla-django-oidc-db
     #   pydantic

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -33,13 +33,13 @@ attrs==23.1.0
     #   -r requirements/base.txt
     #   glom
     #   jsonschema
-beautifulsoup4==4.12.3
+beautifulsoup4==4.12.2
     # via webtest
 billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-black==24.10.0
+black==24.8.0
     # via -r requirements/test-tools.in
 bleach==6.1.0
     # via
@@ -108,7 +108,7 @@ coreschema==0.0.4
     # via
     #   -r requirements/base.txt
     #   coreapi
-coverage==7.6.9
+coverage==4.5.4
     # via
     #   -r requirements/ci.in
     #   codecov
@@ -263,7 +263,7 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via
     #   -r requirements/base.txt
     #   maykin-2fa
-django-webtest==1.9.12
+django-webtest==1.9.10
     # via -r requirements/test-tools.in
 djangorestframework==3.15.2
     # via
@@ -317,17 +317,17 @@ face==20.1.1
     # via
     #   -r requirements/base.txt
     #   glom
-factory-boy==3.3.1
+factory-boy==3.2.1
     # via -r requirements/test-tools.in
-faker==33.1.0
+faker==18.9.0
     # via factory-boy
 flake8==7.1.1
     # via -r requirements/test-tools.in
 flower==2.0.1
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-freezegun==1.5.1
+freezegun==1.2.2
     # via -r requirements/test-tools.in
 furl==2.1.3
     # via
@@ -381,7 +381,7 @@ kombu==5.3.5
     # via
     #   -r requirements/base.txt
     #   celery
-lxml==5.3.0
+lxml==4.9.2
     # via pyquery
 markupsafe==2.1.2
     # via
@@ -397,11 +397,11 @@ mozilla-django-oidc==4.0.0
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
-mozilla-django-oidc-db[django-setup-configuration]==0.21.1
+mozilla-django-oidc-db==0.19.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-multidict==6.1.0
+multidict==6.0.5
     # via yarl
 mypy-extensions==1.0.0
     # via black
@@ -440,8 +440,6 @@ prompt-toolkit==3.0.38
     # via
     #   -r requirements/base.txt
     #   click-repl
-propcache==0.2.1
-    # via yarl
 psycopg2==2.9.9
     # via
     #   -r requirements/base.txt
@@ -452,12 +450,12 @@ pycparser==2.21
     # via
     #   -r requirements/base.txt
     #   cffi
-pydantic==2.10.3
+pydantic==2.9.2
     # via
     #   -r requirements/base.txt
     #   django-setup-configuration
     #   pydantic-settings
-pydantic-core==2.27.1
+pydantic-core==2.23.4
     # via
     #   -r requirements/base.txt
     #   pydantic
@@ -477,7 +475,7 @@ pyopenssl==24.0.0
     #   -r requirements/base.txt
     #   josepy
     #   webauthn
-pyquery==2.0.1
+pyquery==2.0.0
     # via -r requirements/test-tools.in
 pyrsistent==0.19.3
     # via
@@ -554,22 +552,21 @@ six==1.16.0
     #   orderedmultidict
     #   python-dateutil
     #   qrcode
-soupsieve==2.6
+soupsieve==2.4.1
     # via beautifulsoup4
 sqlparse==0.5.0
     # via
     #   -r requirements/base.txt
     #   django
-tblib==3.0.0
+tblib==1.7.0
     # via -r requirements/test-tools.in
 tornado==6.4.1
     # via
     #   -r requirements/base.txt
     #   flower
-typing-extensions==4.12.2
+typing-extensions==4.11.0
     # via
     #   -r requirements/base.txt
-    #   faker
     #   mozilla-django-oidc-db
     #   pydantic
     #   pydantic-core
@@ -590,20 +587,19 @@ urllib3==2.2.2
     #   elastic-apm
     #   requests
     #   sentry-sdk
-    #   vcrpy
 uwsgi==2.0.24
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-vcrpy==6.0.2
+vcrpy==6.0.1
     # via -r requirements/test-tools.in
 vine==5.1.0
     # via
     #   -r requirements/base.txt
     #   amqp
     #   celery
     #   kombu
-waitress==3.0.2
+waitress==2.1.2
     # via webtest
 wcwidth==0.2.6
     # via
@@ -617,16 +613,16 @@ webencodings==0.5.1
     # via
     #   -r requirements/base.txt
     #   bleach
-webob==1.8.9
+webob==1.8.8
     # via webtest
-webtest==3.0.2
+webtest==3.0.0
     # via django-webtest
 wrapt==1.14.1
     # via
     #   -r requirements/base.txt
     #   elastic-apm
     #   vcrpy
-yarl==1.18.3
+yarl==1.9.4
     # via vcrpy
 zgw-consumers==0.35.1
     # via