Merge pull request #35297 from openedx/MueezKhan246/upgrade-edx-enter…

…prise-74af0e7 feat: Upgrade Python dependency edx-enterprise
openedx · Aug 12, 2024 · 059f833 · 059f833
2 parents 200ee1a + 04e5076
commit 059f833
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 24 deletions.
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -26,15 +26,6 @@ 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

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -20,7 +20,7 @@ celery>=5.2.2,<6.0.0
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==4.23.3
+edx-enterprise==4.23.4
 
 # Stay on LTS version, remove once this is added to common constraint
 Django<5.0

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -465,7 +465,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.23.3
+edx-enterprise==4.23.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
@@ -647,9 +647,7 @@ idna==3.7
     #   snowflake-connector-python
     #   yarl
 importlib-metadata==6.11.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   -r requirements/edx/kernel.in
+    # via -r requirements/edx/kernel.in
 inflection==0.5.1
     # via
     #   drf-spectacular

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -740,7 +740,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.23.3
+edx-enterprise==4.23.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
@@ -1065,7 +1065,6 @@ 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/doc.txt
     #   -r requirements/edx/testing.txt
 inflection==0.5.1

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -545,7 +545,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.23.3
+edx-enterprise==4.23.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -767,9 +767,7 @@ idna==3.7
 imagesize==1.4.1
     # via sphinx
 importlib-metadata==6.11.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   -r requirements/edx/base.txt
+    # via -r requirements/edx/base.txt
 inflection==0.5.1
     # via
     #   -r requirements/edx/base.txt

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -569,7 +569,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.23.3
+edx-enterprise==4.23.4
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -808,9 +808,7 @@ idna==3.7
 import-linter==2.0
     # via -r requirements/edx/testing.in
 importlib-metadata==6.11.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   -r requirements/edx/base.txt
+    # via -r requirements/edx/base.txt
 inflection==0.5.1
     # via
     #   -r requirements/edx/base.txt