Merge pull request openedx#35458 from magajh/magajh/patch-django-redw…

…ood-4.2.16 chore: update Django to 4.2.16 for Redwood - Security Patch
nelc · Oct 17, 2024 · 5071f28 · 5071f28
2 parents 9c8059b + daf696a
commit 5071f28
Show file tree

Hide file tree

Showing 8 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/edx/base.txt b/requirements/edx/base.txt
@@ -177,7 +177,7 @@ defusedxml==0.7.1
     #   ora2
     #   python3-openid
     #   social-auth-core
-django==4.2.15
+django==4.2.16
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -614,9 +614,7 @@ idna==3.7
     #   snowflake-connector-python
     #   yarl
 importlib-metadata==6.11.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   markdown
+    # via markdown
 importlib-resources==5.13.0
     # via
     #   jsonschema

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -347,7 +347,7 @@ distlib==0.3.8
     # via
     #   -r requirements/edx/testing.txt
     #   virtualenv
-django==4.2.15
+django==4.2.16
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -1035,7 +1035,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/../pip-tools.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -227,7 +227,7 @@ defusedxml==0.7.1
     #   ora2
     #   python3-openid
     #   social-auth-core
-django==4.2.15
+django==4.2.16
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -712,7 +712,6 @@ imagesize==1.4.1
     # via sphinx
 importlib-metadata==6.11.0
     # via
-    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   markdown
     #   sphinx

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -263,7 +263,7 @@ dill==0.3.8
     # via pylint
 distlib==0.3.8
     # via virtualenv
-django==4.2.15
+django==4.2.16
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -c requirements/edx/../constraints.txt
@@ -782,7 +782,6 @@ 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
     #   markdown
     #   pytest-randomly

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -11,9 +11,7 @@ click==8.1.6
     #   -c requirements/constraints.txt
     #   pip-tools
 importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   build
+    # via build
 packaging==24.0
     # via build
 pip-tools==7.4.1

diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt
@@ -39,7 +39,7 @@ click==8.1.6
     #   edx-django-utils
 cryptography==42.0.7
     # via pyjwt
-django==4.2.15
+django==4.2.16
     # via
     #   -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
     #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt

diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt
@@ -56,7 +56,7 @@ cryptography==42.0.7
     #   pyjwt
 ddt==1.7.2
     # via -r scripts/user_retirement/requirements/testing.in
-django==4.2.15
+django==4.2.16
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   django-crum