chore: Upgrade python requirements

openedx · Feb 21, 2024 · 231ee55 · 231ee55
1 parent 621719c
commit 231ee55
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 83 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,15 +8,16 @@ appdirs==1.4.4
     # via fs
 asgiref==3.7.2
     # via django
-boto3==1.34.44
+backports-zoneinfo==0.2.1
+    # via django
+boto3==1.34.46
     # via fs-s3fs
-botocore==1.34.44
+botocore==1.34.46
     # via
     #   boto3
     #   s3transfer
-django==3.2.24
+django==4.2.10
     # via
-    #   -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   django-crum
     #   openedx-django-pyfs
     #   openedx-filters
@@ -35,8 +36,10 @@ jmespath==1.0.1
     #   botocore
 lazy==1.6
     # via xblock
-lxml==5.1.0
-    # via xblock
+lxml==4.9.4
+    # via
+    #   -c requirements/constraints.txt
+    #   xblock
 mako==1.3.2
     # via xblock
 markupsafe==2.1.5
@@ -52,9 +55,7 @@ python-dateutil==2.8.2
     #   botocore
     #   xblock
 pytz==2024.1
-    # via
-    #   django
-    #   xblock
+    # via xblock
 pyyaml==6.0.1
     # via xblock
 s3transfer==0.10.0

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -21,15 +21,19 @@ astroid==3.0.3
     #   -r requirements/test.txt
     #   pylint
     #   pylint-celery
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/test.txt
+    #   django
 binaryornot==0.4.4
     # via
     #   -r requirements/test.txt
     #   cookiecutter
-boto3==1.34.44
+boto3==1.34.46
     # via
     #   -r requirements/test.txt
     #   fs-s3fs
-botocore==1.34.44
+botocore==1.34.46
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -42,10 +46,6 @@ certifi==2024.2.2
     # via
     #   -r requirements/test.txt
     #   requests
-cffi==1.16.0
-    # via
-    #   -r requirements/test.txt
-    #   cryptography
 chardet==5.2.0
     # via
     #   -r requirements/test.txt
@@ -85,10 +85,6 @@ coverage==6.5.0
     #   coveralls
 coveralls==3.3.1
     # via -r requirements/test.txt
-cryptography==42.0.3
-    # via
-    #   -r requirements/test.txt
-    #   secretstorage
 ddt==1.7.1
     # via -r requirements/test.txt
 dill==0.3.8
@@ -99,9 +95,8 @@ distlib==0.3.8
     # via
     #   -r requirements/tox.txt
     #   virtualenv
-django==3.2.24
+django==4.2.10
     # via
-    #   -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/test.txt
     #   django-crum
     #   openedx-django-pyfs
@@ -164,11 +159,6 @@ jaraco-classes==3.3.1
     # via
     #   -r requirements/test.txt
     #   keyring
-jeepney==0.8.0
-    # via
-    #   -r requirements/test.txt
-    #   keyring
-    #   secretstorage
 jinja2==3.1.3
     # via
     #   -r requirements/test.txt
@@ -187,8 +177,9 @@ lazy==1.6
     # via
     #   -r requirements/test.txt
     #   xblock
-lxml==5.1.0
+lxml==4.9.4
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   xblock
     #   xblock-sdk
@@ -260,10 +251,6 @@ pluggy==1.4.0
     #   tox
 pycodestyle==2.11.1
     # via -r requirements/test.txt
-pycparser==2.21
-    # via
-    #   -r requirements/test.txt
-    #   cffi
 pygments==2.17.2
     # via
     #   -r requirements/test.txt
@@ -317,7 +304,6 @@ python-slugify==8.0.4
 pytz==2024.1
     # via
     #   -r requirements/test.txt
-    #   django
     #   xblock
 pyyaml==6.0.1
     # via
@@ -354,10 +340,6 @@ s3transfer==0.10.0
     # via
     #   -r requirements/test.txt
     #   boto3
-secretstorage==3.3.3
-    # via
-    #   -r requirements/test.txt
-    #   keyring
 simplejson==3.19.2
     # via
     #   -r requirements/test.txt

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -9,4 +9,13 @@
 # linking to it here is good.
 
 # Common constraints for edx repos
--c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
+# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
+
+# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
+# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
+elasticsearch<7.14.0
+
+# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
+django-simple-history==3.0.0
+
+lxml<5.0.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -12,16 +12,20 @@ asgiref==3.7.2
     # via
     #   -r requirements/base.txt
     #   django
-boto3==1.34.44
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/base.txt
+    #   django
+boto3==1.34.46
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
-botocore==1.34.44
+botocore==1.34.46
     # via
     #   -r requirements/base.txt
     #   boto3
     #   s3transfer
-django==3.2.24
+django==4.2.10
     # via
     #   -r requirements/base.txt
     #   django-crum
@@ -51,7 +55,7 @@ lazy==1.6
     # via
     #   -r requirements/base.txt
     #   xblock
-lxml==5.1.0
+lxml==4.9.4
     # via
     #   -r requirements/base.txt
     #   edx-i18n-tools
@@ -83,7 +87,6 @@ python-dateutil==2.8.2
 pytz==2024.1
     # via
     #   -r requirements/base.txt
-    #   django
     #   xblock
 pyyaml==6.0.1
     # via

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -20,13 +20,17 @@ babel==2.14.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/base.txt
+    #   django
 beautifulsoup4==4.12.3
     # via pydata-sphinx-theme
-boto3==1.34.44
+boto3==1.34.46
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
-botocore==1.34.44
+botocore==1.34.46
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -35,7 +39,7 @@ certifi==2024.2.2
     # via requests
 charset-normalizer==3.3.2
     # via requests
-django==3.2.24
+django==4.2.10
     # via
     #   -r requirements/base.txt
     #   django-crum
@@ -74,7 +78,7 @@ lazy==1.6
     # via
     #   -r requirements/base.txt
     #   xblock
-lxml==5.1.0
+lxml==4.9.4
     # via
     #   -r requirements/base.txt
     #   xblock
@@ -114,7 +118,6 @@ pytz==2024.1
     # via
     #   -r requirements/base.txt
     #   babel
-    #   django
     #   xblock
 pyyaml==6.0.1
     # via

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -18,21 +18,23 @@ astroid==3.0.3
     # via
     #   pylint
     #   pylint-celery
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/base.txt
+    #   django
 binaryornot==0.4.4
     # via cookiecutter
-boto3==1.34.44
+boto3==1.34.46
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
-botocore==1.34.44
+botocore==1.34.46
     # via
     #   -r requirements/base.txt
     #   boto3
     #   s3transfer
 certifi==2024.2.2
     # via requests
-cffi==1.16.0
-    # via cryptography
 chardet==5.2.0
     # via binaryornot
 charset-normalizer==3.3.2
@@ -49,15 +51,12 @@ code-annotations==1.6.0
     # via edx-lint
 cookiecutter==2.5.0
     # via xblock-sdk
-cryptography==42.0.3
-    # via secretstorage
 ddt==1.7.1
     # via -r requirements/quality.in
 dill==0.3.8
     # via pylint
-django==3.2.24
+django==4.2.10
     # via
-    #   -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.txt
     #   django-crum
     #   openedx-django-pyfs
@@ -92,10 +91,6 @@ isort==5.13.2
     # via pylint
 jaraco-classes==3.3.1
     # via keyring
-jeepney==0.8.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.3
     # via
     #   code-annotations
@@ -111,8 +106,9 @@ lazy==1.6
     # via
     #   -r requirements/base.txt
     #   xblock
-lxml==5.1.0
+lxml==4.9.4
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   xblock
     #   xblock-sdk
@@ -150,8 +146,6 @@ platformdirs==4.2.0
     # via pylint
 pycodestyle==2.11.1
     # via -r requirements/quality.in
-pycparser==2.21
-    # via cffi
 pygments==2.17.2
     # via
     #   readme-renderer
@@ -186,7 +180,6 @@ python-slugify==8.0.4
 pytz==2024.1
     # via
     #   -r requirements/base.txt
-    #   django
     #   xblock
 pyyaml==6.0.1
     # via
@@ -214,8 +207,6 @@ s3transfer==0.10.0
     # via
     #   -r requirements/base.txt
     #   boto3
-secretstorage==3.3.3
-    # via keyring
 simplejson==3.19.2
     # via
     #   -r requirements/base.txt