fix: recompile requirements

open-craft · Sep 27, 2024 · e4e94bf · e4e94bf
1 parent d85e55b
commit e4e94bf
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 276 deletions.
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -21,15 +21,14 @@ Django<5.0
 
 # 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
+# See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 
-# opentelemetry requires version 6.x at the moment:
-# https://github.com/open-telemetry/opentelemetry-python/issues/3570
-# Normally this could be added as a constraint in edx-django-utils, where we're
-# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
-# that uses version 7.x, and then there's no undoing that when compiling base.txt.
-# So we need to pin it globally, for now.
-# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
-importlib-metadata<7
+# Cause: https://github.com/openedx/event-tracking/pull/290
+# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
+# We will pin event-tracking to do not break existing installations
+# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
+# has been resolved and edx-platform is running with pymongo>=4.4.0
+event-tracking<2.4.1
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -22,8 +22,6 @@ cycler==0.12.1
     # via matplotlib
 fonttools==4.51.0
     # via matplotlib
-importlib-resources==6.4.0
-    # via matplotlib
 joblib==1.4.2
     # via nltk
 kiwisolver==1.4.5
@@ -89,5 +87,3 @@ sympy==1.12
     #   openedx-calc
 tqdm==4.66.4
     # via nltk
-zipp==3.18.1
-    # via importlib-resources
diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -33,10 +33,6 @@ asgiref==3.8.1
     #   django-countries
 asn1crypto==1.5.1
     # via snowflake-connector-python
-async-timeout==4.0.3
-    # via
-    #   aiohttp
-    #   redis
 attrs==23.2.0
     # via
     #   -r requirements/edx/kernel.in
@@ -55,14 +51,6 @@ babel==2.15.0
     #   enmerkar-underscore
 backoff==1.10.0
     # via analytics-python
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   celery
-    #   django
-    #   edx-milestones
-    #   icalendar
-    #   kombu
 beautifulsoup4==4.12.3
     # via pynliner
 billiard==4.2.0
@@ -566,6 +554,7 @@ enmerkar-underscore==2.3.0
     # via -r requirements/edx/kernel.in
 event-tracking==2.4.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/kernel.in
     #   edx-completion
     #   edx-proctoring
@@ -611,15 +600,8 @@ idna==3.7
     #   requests
     #   snowflake-connector-python
     #   yarl
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   markdown
-importlib-resources==5.13.0
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-    #   pycountry
+importlib-metadata==8.5.0
+    # via -r requirements/edx/bundled.in
 inflection==0.5.1
     # via
     #   drf-spectacular
@@ -842,8 +824,6 @@ pillow==10.3.0
     #   edx-enterprise
     #   edx-organizations
     #   edxval
-pkgutil-resolve-name==1.3.10
-    # via jsonschema
 platformdirs==4.2.1
     # via snowflake-connector-python
 polib==1.2.0
@@ -957,7 +937,6 @@ python3-saml==1.16.0
 pytz==2024.1
     # via
     #   -r requirements/edx/kernel.in
-    #   babel
     #   django-ses
     #   djangorestframework
     #   drf-yasg
@@ -1152,21 +1131,15 @@ tqdm==4.66.4
 typing-extensions==4.11.0
     # via
     #   -r requirements/edx/paver.txt
-    #   annotated-types
-    #   asgiref
     #   django-countries
-    #   drf-spectacular
     #   edx-opaque-keys
     #   jwcrypto
-    #   kombu
     #   pydantic
     #   pydantic-core
     #   pylti1p3
     #   snowflake-connector-python
 tzdata==2024.1
-    # via
-    #   backports-zoneinfo
-    #   celery
+    # via celery
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/kernel.in
@@ -1184,7 +1157,6 @@ urllib3==1.26.18
     #   elasticsearch
     #   py2neo
     #   requests
-    #   snowflake-connector-python
 user-util==1.1.0
     # via -r requirements/edx/kernel.in
 vine==5.1.0
@@ -1251,10 +1223,8 @@ xss-utils==0.6.0
     # via -r requirements/edx/kernel.in
 yarl==1.9.4
     # via aiohttp
-zipp==3.18.1
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+zipp==3.20.2
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in
@@ -49,4 +49,8 @@ xblock-poll                         # Xblock for polling users
 xblock-drag-and-drop-v2             # Drag and Drop XBlock
 xblock-google-drive                 # XBlock for google docs and calendar
 
+# Fix for ORA uploads
 git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads
+
+# Missing after compiling requirements
+importlib-metadata
diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -82,12 +82,6 @@ astroid==2.13.5
     #   -r requirements/edx/testing.txt
     #   pylint
     #   pylint-celery
-async-timeout==4.0.3
-    # via
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-    #   aiohttp
-    #   redis
 attrs==23.2.0
     # via
     #   -r requirements/edx/doc.txt
@@ -113,16 +107,6 @@ backoff==1.10.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   analytics-python
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-    #   celery
-    #   django
-    #   edx-milestones
-    #   icalendar
-    #   kombu
 beautifulsoup4==4.12.3
     # via
     #   -r requirements/edx/doc.txt
@@ -894,16 +878,12 @@ enmerkar-underscore==2.3.0
     #   -r requirements/edx/testing.txt
 event-tracking==2.4.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-completion
     #   edx-proctoring
     #   edx-search
-exceptiongroup==1.2.1
-    # via
-    #   -r requirements/edx/testing.txt
-    #   anyio
-    #   pytest
 execnet==2.1.1
     # via
     #   -r requirements/edx/testing.txt
@@ -1031,23 +1011,10 @@ imagesize==1.4.1
     #   sphinx
 import-linter==2.0
     # via -r requirements/edx/testing.txt
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   -r requirements/edx/../pip-tools.txt
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-    #   build
-    #   markdown
-    #   pytest-randomly
-    #   sphinx
-importlib-resources==5.13.0
+importlib-metadata==8.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   jsonschema
-    #   jsonschema-specifications
-    #   pycountry
 inflection==0.5.1
     # via
     #   -r requirements/edx/doc.txt
@@ -1371,7 +1338,7 @@ optimizely-sdk==4.1.1
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-ora2==6.9.0
+ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1446,11 +1413,6 @@ pillow==10.3.0
     #   edxval
 pip-tools==7.4.1
     # via -r requirements/edx/../pip-tools.txt
-pkgutil-resolve-name==1.3.10
-    # via
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-    #   jsonschema
 platformdirs==4.2.1
     # via
     #   -r requirements/edx/doc.txt
@@ -1729,7 +1691,6 @@ pytz==2024.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   babel
     #   django-ses
     #   djangorestframework
     #   drf-yasg
@@ -2075,20 +2036,7 @@ tinycss2==1.2.1
     #   -r requirements/edx/testing.txt
     #   bleach
 tomli==2.0.1
-    # via
-    #   -r requirements/edx/../pip-tools.txt
-    #   -r requirements/edx/testing.txt
-    #   build
-    #   coverage
-    #   django-stubs
-    #   import-linter
-    #   mypy
-    #   pip-tools
-    #   pylint
-    #   pyproject-api
-    #   pytest
-    #   tox
-    #   vulture
+    # via django-stubs
 tomlkit==0.12.5
     # via
     #   -r requirements/edx/doc.txt
@@ -2121,38 +2069,26 @@ typing-extensions==4.11.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   annotated-types
-    #   anyio
-    #   asgiref
-    #   astroid
     #   django-countries
     #   django-stubs
     #   django-stubs-ext
     #   djangorestframework-stubs
-    #   drf-spectacular
     #   edx-opaque-keys
     #   fastapi
     #   grimp
     #   import-linter
     #   jwcrypto
-    #   kombu
     #   mypy
-    #   pact-python
     #   pydantic
     #   pydantic-core
     #   pydata-sphinx-theme
-    #   pylint
     #   pylti1p3
-    #   rich
     #   snowflake-connector-python
-    #   starlette
     #   typer
-    #   uvicorn
 tzdata==2024.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   backports-zoneinfo
     #   celery
 ujson==5.9.0
     # via
@@ -2181,7 +2117,6 @@ urllib3==1.26.18
     #   elasticsearch
     #   py2neo
     #   requests
-    #   snowflake-connector-python
 user-util==1.1.0
     # via
     #   -r requirements/edx/doc.txt
@@ -2317,13 +2252,11 @@ yarl==1.9.4
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   pact-python
-zipp==3.18.1
+zipp==3.20.2
     # via
-    #   -r requirements/edx/../pip-tools.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   importlib-metadata
-    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip