Merge remote-tracking branch 'origin/add-django42' into add-django42

openedx-unsupported · Oct 7, 2023 · 515ef27 · 515ef27
2 parents 2051c2f + 903445c
commit 515ef27
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 53 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -14,8 +14,6 @@ async-timeout==4.0.3
     # via redis
 backoff==1.10.0
     # via analytics-python
-backports-zoneinfo==0.2.1
-    # via django
 billiard==3.6.4.0
     # via celery
 celery==4.4.7
@@ -37,12 +35,13 @@ cryptography==41.0.4
     # via
     #   pyjwt
     #   social-auth-core
-defusedxml==0.8.0rc1
+defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
 django==3.2.22
     # via
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-cors-headers
@@ -81,9 +80,6 @@ django-mysql==4.11.0
     # via -r requirements/base.in
 django-simple-history==3.4.0
     # via -r requirements/base.in
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.in
 django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
@@ -168,6 +164,7 @@ pytz==2023.3.post1
     # via
     #   -r requirements/base.in
     #   celery
+    #   django
     #   djangorestframework
     #   drf-yasg
 pyyaml==6.0.1

diff --git a/requirements/devstack.txt b/requirements/devstack.txt
@@ -40,10 +40,6 @@ backoff==1.10.0
     # via
     #   -r requirements/local.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
-    # via
-    #   -r requirements/local.txt
-    #   django
 beautifulsoup4==4.12.2
     # via
     #   -r requirements/local.txt
@@ -52,12 +48,12 @@ billiard==3.6.4.0
     # via
     #   -r requirements/local.txt
     #   celery
-boto3==1.28.60
+boto3==1.28.61
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   moto
-botocore==1.31.60
+botocore==1.31.61
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -128,6 +124,7 @@ distlib==0.3.7
     #   virtualenv
 django==3.2.22
     # via
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   django-cors-headers
@@ -174,8 +171,6 @@ django-mysql==4.11.0
     # via -r requirements/local.txt
 django-simple-history==3.4.0
     # via -r requirements/local.txt
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/local.txt
 django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
@@ -222,7 +217,7 @@ edx-django-utils==5.7.0
     #   edx-rest-api-client
 edx-drf-extensions==8.10.0
     # via -r requirements/local.txt
-edx-i18n-tools==1.2.0
+edx-i18n-tools==1.3.0
     # via -r requirements/local.txt
 edx-lint==5.3.4
     # via -r requirements/local.txt
@@ -292,6 +287,10 @@ lazy-object-proxy==1.9.0
     # via
     #   -r requirements/local.txt
     #   astroid
+lxml==4.9.3
+    # via
+    #   -r requirements/local.txt
+    #   edx-i18n-tools
 lz4==4.3.2
     # via
     #   -r requirements/local.txt
@@ -453,6 +452,7 @@ pytz==2023.3.post1
     #   -r requirements/local.txt
     #   babel
     #   celery
+    #   django
     #   djangorestframework
     #   drf-yasg
 pywatchman==1.4.1

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -40,10 +40,6 @@ backoff==1.10.0
     # via
     #   -r requirements/test.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
-    # via
-    #   -r requirements/test.txt
-    #   django
 beautifulsoup4==4.12.2
     # via
     #   -r requirements/docs.txt
@@ -52,12 +48,12 @@ billiard==3.6.4.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.28.60
+boto3==1.28.61
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   moto
-botocore==1.31.60
+botocore==1.31.61
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -128,6 +124,7 @@ distlib==0.3.7
     #   virtualenv
 django==3.2.22
     # via
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   django-cors-headers
@@ -174,8 +171,6 @@ django-mysql==4.11.0
     # via -r requirements/test.txt
 django-simple-history==3.4.0
     # via -r requirements/test.txt
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/test.txt
 django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
@@ -222,7 +217,7 @@ edx-django-utils==5.7.0
     #   edx-rest-api-client
 edx-drf-extensions==8.10.0
     # via -r requirements/test.txt
-edx-i18n-tools==1.2.0
+edx-i18n-tools==1.3.0
     # via -r requirements/local.in
 edx-lint==5.3.4
     # via -r requirements/test.txt
@@ -294,6 +289,8 @@ lazy-object-proxy==1.9.0
     # via
     #   -r requirements/test.txt
     #   astroid
+lxml==4.9.3
+    # via edx-i18n-tools
 lz4==4.3.2
     # via ruamel-yaml-cmd
 markupsafe==2.1.3
@@ -446,6 +443,7 @@ pytz==2023.3.post1
     #   -r requirements/test.txt
     #   babel
     #   celery
+    #   django
     #   djangorestframework
     #   drf-yasg
 pywatchman==1.4.1

diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt
@@ -61,13 +61,6 @@ backoff==1.10.0
     #   -r requirements/monitoring/../production.txt
     #   -r requirements/monitoring/../test.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
-    # via
-    #   -r requirements/monitoring/../devstack.txt
-    #   -r requirements/monitoring/../local.txt
-    #   -r requirements/monitoring/../production.txt
-    #   -r requirements/monitoring/../test.txt
-    #   django
 beautifulsoup4==4.12.2
     # via
     #   -r requirements/monitoring/../devstack.txt
@@ -80,14 +73,14 @@ billiard==3.6.4.0
     #   -r requirements/monitoring/../production.txt
     #   -r requirements/monitoring/../test.txt
     #   celery
-boto3==1.28.60
+boto3==1.28.61
     # via
     #   -r requirements/monitoring/../devstack.txt
     #   -r requirements/monitoring/../local.txt
     #   -r requirements/monitoring/../production.txt
     #   -r requirements/monitoring/../test.txt
     #   moto
-botocore==1.31.60
+botocore==1.31.61
     # via
     #   -r requirements/monitoring/../devstack.txt
     #   -r requirements/monitoring/../local.txt
@@ -355,7 +348,7 @@ edx-drf-extensions==8.10.0
     #   -r requirements/monitoring/../local.txt
     #   -r requirements/monitoring/../production.txt
     #   -r requirements/monitoring/../test.txt
-edx-i18n-tools==1.2.0
+edx-i18n-tools==1.3.0
     # via
     #   -r requirements/monitoring/../devstack.txt
     #   -r requirements/monitoring/../local.txt
@@ -479,6 +472,11 @@ lazy-object-proxy==1.9.0
     #   -r requirements/monitoring/../local.txt
     #   -r requirements/monitoring/../test.txt
     #   astroid
+lxml==4.9.3
+    # via
+    #   -r requirements/monitoring/../devstack.txt
+    #   -r requirements/monitoring/../local.txt
+    #   edx-i18n-tools
 lz4==4.3.2
     # via
     #   -r requirements/monitoring/../devstack.txt
@@ -726,6 +724,7 @@ pytz==2023.3.post1
     #   -r requirements/monitoring/../test.txt
     #   babel
     #   celery
+    #   django
     #   djangorestframework
     #   drf-yasg
 pywatchman==1.4.1
@@ -1021,7 +1020,7 @@ zope-event==5.0
     # via
     #   -r requirements/monitoring/../production.txt
     #   gevent
-zope-interface==6.0
+zope-interface==6.1
     # via
     #   -r requirements/monitoring/../production.txt
     #   gevent

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -22,19 +22,15 @@ backoff==1.10.0
     # via
     #   -r requirements/base.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
-    # via
-    #   -r requirements/base.txt
-    #   django
 billiard==3.6.4.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.28.60
+boto3==1.28.61
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/production.in
-botocore==1.31.60
+botocore==1.31.61
     # via
     #   boto3
     #   s3transfer
@@ -72,6 +68,7 @@ defusedxml==0.8.0rc2
     #   social-auth-core
 django==3.2.22
     # via
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   django-cors-headers
@@ -112,8 +109,6 @@ django-mysql==4.11.0
     # via -r requirements/base.txt
 django-simple-history==3.4.0
     # via -r requirements/base.txt
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.txt
 django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
@@ -251,6 +246,7 @@ pytz==2023.3.post1
     # via
     #   -r requirements/base.txt
     #   celery
+    #   django
     #   djangorestframework
     #   drf-yasg
 pyyaml==6.0.1
@@ -333,7 +329,7 @@ vine==1.3.0
     #   celery
 zope-event==5.0
     # via gevent
-zope-interface==6.0
+zope-interface==6.1
     # via gevent
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -26,19 +26,15 @@ backoff==1.10.0
     # via
     #   -r requirements/base.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
-    # via
-    #   -r requirements/base.txt
-    #   django
 billiard==3.6.4.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.28.60
+boto3==1.28.61
     # via
     #   -c requirements/constraints.txt
     #   moto
-botocore==1.31.60
+botocore==1.31.61
     # via
     #   boto3
     #   moto
@@ -97,6 +93,7 @@ dill==0.3.7
 distlib==0.3.7
     # via virtualenv
     # via
+    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   django-cors-headers
@@ -139,9 +136,6 @@ django-mysql==4.11.0
     # via -r requirements/base.txt
 django-simple-history==3.4.0
     # via -r requirements/base.txt
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.txt
 django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
@@ -346,6 +340,7 @@ pytz==2023.3.post1
     # via
     #   -r requirements/base.txt
     #   celery
+    #   django
     #   djangorestframework
     #   drf-yasg
 pyyaml==6.0.1