fix: bump ora2 to fix uploads (#693)

open-craft · Oct 9, 2024 · 321f2d0 · 321f2d0
1 parent 3b56cca
commit 321f2d0
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 43 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
@@ -22,7 +22,7 @@ cycler==0.12.1
     # via matplotlib
 fonttools==4.51.0
     # via matplotlib
-importlib-resources==6.4.0
+importlib-resources==6.4.5
     # via matplotlib
 joblib==1.4.2
     # via nltk
@@ -89,5 +89,5 @@ sympy==1.12
     #   openedx-calc
 tqdm==4.66.4
     # via nltk
-zipp==3.18.1
+zipp==3.20.2
     # via importlib-resources
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -566,6 +566,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,9 +612,9 @@ idna==3.7
     #   requests
     #   snowflake-connector-python
     #   yarl
-importlib-metadata==6.11.0
+importlib-metadata==8.5.0
     # via
-    #   -c requirements/edx/../common_constraints.txt
+    #   -r requirements/edx/bundled.in
     #   markdown
 importlib-resources==5.13.0
     # via
@@ -804,7 +805,7 @@ optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
-ora2==6.9.0
+ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads
     # via -r requirements/edx/bundled.in
 packaging==24.0
     # via
@@ -1251,7 +1252,7 @@ xss-utils==0.6.0
     # via -r requirements/edx/kernel.in
 yarl==1.9.4
     # via aiohttp
-zipp==3.18.1
+zipp==3.20.2
     # via
     #   importlib-metadata
     #   importlib-resources

diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in
@@ -44,7 +44,13 @@ done-xblock                         # a very simple XBlock that allows learners
 recommender-xblock                  # https://github.com/edx/RecommenderXBlock
 staff-graded-xblock                 # https://github.com/openedx/staff_graded-xblock Allows off-site bulk scoring.
 edx-sga                             # The more well known "staff graded assignment" XBlock, from MIT.
-ora2>=4.5.0                         # Open Response Assessment XBlock
+# ora2>=4.5.0                         # Open Response Assessment XBlock
 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/development.txt b/requirements/edx/development.txt
@@ -894,12 +894,13 @@ 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
+exceptiongroup==1.2.2
     # via
     #   -r requirements/edx/testing.txt
     #   anyio
@@ -1031,9 +1032,8 @@ imagesize==1.4.1
     #   sphinx
 import-linter==2.0
     # via -r requirements/edx/testing.txt
-importlib-metadata==6.11.0
+importlib-metadata==8.5.0
     # via
-    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/../pip-tools.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1371,7 +1371,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
@@ -2074,7 +2074,7 @@ tinycss2==1.2.1
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   bleach
-tomli==2.0.1
+tomli==2.0.2
     # via
     #   -r requirements/edx/../pip-tools.txt
     #   -r requirements/edx/testing.txt
@@ -2317,7 +2317,7 @@ 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

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -650,6 +650,7 @@ enmerkar-underscore==2.3.0
     # via -r requirements/edx/base.txt
 event-tracking==2.4.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-completion
     #   edx-proctoring
@@ -708,9 +709,8 @@ idna==3.7
     #   yarl
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==6.11.0
+importlib-metadata==8.5.0
     # via
-    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   markdown
     #   sphinx
@@ -940,7 +940,7 @@ optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-ora2==6.9.0
+ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads
     # via -r requirements/edx/base.txt
 packaging==24.0
     # via
@@ -1521,7 +1521,7 @@ yarl==1.9.4
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
-zipp==3.18.1
+zipp==3.20.2
     # via
     #   -r requirements/edx/base.txt
     #   importlib-metadata

diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt
@@ -40,7 +40,7 @@ glom==22.1.0
     # via semgrep
 idna==3.7
     # via requests
-importlib-resources==6.4.0
+importlib-resources==6.4.5
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -91,5 +91,5 @@ urllib3==1.26.18
     #   semgrep
 wcmatch==8.5.1
     # via semgrep
-zipp==3.18.1
+zipp==3.20.2
     # via importlib-resources
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -687,11 +687,12 @@ enmerkar-underscore==2.3.0
     # via -r requirements/edx/base.txt
 event-tracking==2.4.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-completion
     #   edx-proctoring
     #   edx-search
-exceptiongroup==1.2.1
+exceptiongroup==1.2.2
     # via
     #   anyio
     #   pytest
@@ -778,9 +779,8 @@ idna==3.7
     #   yarl
 import-linter==2.0
     # via -r requirements/edx/testing.in
-importlib-metadata==6.11.0
+importlib-metadata==8.5.0
     # via
-    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   markdown
     #   pytest-randomly
@@ -1025,7 +1025,7 @@ optimizely-sdk==4.1.1
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-ora2==6.9.0
+ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads
     # via -r requirements/edx/base.txt
 orjson==3.10.3
     # via fastapi
@@ -1527,7 +1527,7 @@ tinycss2==1.2.1
     # via
     #   -r requirements/edx/base.txt
     #   bleach
-tomli==2.0.1
+tomli==2.0.2
     # via
     #   coverage
     #   import-linter
@@ -1697,7 +1697,7 @@ yarl==1.9.4
     #   -r requirements/edx/base.txt
     #   aiohttp
     #   pact-python
-zipp==3.18.1
+zipp==3.20.2
     # via
     #   -r requirements/edx/base.txt
     #   importlib-metadata

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -10,10 +10,8 @@ click==8.1.6
     # via
     #   -c requirements/constraints.txt
     #   pip-tools
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   build
+importlib-metadata==8.5.0
+    # via build
 packaging==24.0
     # via build
 pip-tools==7.4.1
@@ -22,13 +20,13 @@ pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-tomli==2.0.1
+tomli==2.0.2
     # via
     #   build
     #   pip-tools
 wheel==0.43.0
     # via pip-tools
-zipp==3.18.1
+zipp==3.20.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt
@@ -14,7 +14,7 @@ ddt==1.7.2
     # via -r scripts/structures_pruning/requirements/testing.in
 edx-opaque-keys==2.9.0
     # via -r scripts/structures_pruning/requirements/base.txt
-exceptiongroup==1.2.1
+exceptiongroup==1.2.2
     # via pytest
 iniconfig==2.0.0
     # via pytest
@@ -36,7 +36,7 @@ stevedore==5.2.0
     # via
     #   -r scripts/structures_pruning/requirements/base.txt
     #   edx-opaque-keys
-tomli==2.0.1
+tomli==2.0.2
     # via pytest
 typing-extensions==4.11.0
     # via

diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt
@@ -76,7 +76,7 @@ edx-django-utils==5.13.0
     #   edx-rest-api-client
 edx-rest-api-client==5.7.0
     # via -r scripts/user_retirement/requirements/base.txt
-exceptiongroup==1.2.1
+exceptiongroup==1.2.2
     # via pytest
 google-api-core==2.19.0
     # via
@@ -268,7 +268,7 @@ stevedore==5.2.0
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-tomli==2.0.1
+tomli==2.0.2
     # via pytest
 typing-extensions==4.11.0
     # via