Merge pull request #230 from CUCWD/feature.maple/ztraboo/update-broke…

…n-edx-repos Applied `django-require` package updates needed to successfully build the `openedx` Docker image for `maple`.
CUCWD · Mar 21, 2024 · b65a19b · b65a19b
2 parents b7a6c1b + 34b626d
commit b65a19b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
@@ -165,5 +165,6 @@ XBlock                              # Courseware component architecture
 xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
 enmerkar-underscore                 # Implements a underscore extractor for django-babel.
+openedx-django-require
 
-# -r private.txt            # Include our EducateWorkforce specific packages
+# -r private.txt            # Include our EducateWorkforce specific packages
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -316,8 +316,6 @@ django-ratelimit==3.0.1
     # via -r requirements/edx/base.in
 django-ratelimit-backend @ git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e
     # via -r requirements/edx/github.in
-django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
-    # via -r requirements/edx/github.in
 django-sekizai==2.0.0
     # via
     #   -r requirements/edx/base.in
@@ -684,6 +682,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==2.0.1
     # via -r requirements/edx/base.in
+openedx-django-require==2.1.0
+    # via -r requirements/edx/base.in
 openedx-events==0.6.0
     # via -r requirements/edx/base.in
 ora2==3.7.2

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -409,8 +409,6 @@ django-ratelimit==3.0.1
     # via -r requirements/edx/testing.txt
 django-ratelimit-backend @ git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e
     # via -r requirements/edx/testing.txt
-django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
-    # via -r requirements/edx/testing.txt
 django-sekizai==2.0.0
     # via
     #   -r requirements/edx/testing.txt
@@ -917,6 +915,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==2.0.1
     # via -r requirements/edx/testing.txt
+openedx-django-require==2.1.0
+    # via -r requirements/edx/testing.txt
 openedx-events==0.6.0
     # via -r requirements/edx/testing.txt
 ora2==3.7.2

diff --git a/requirements/edx/github.in b/requirements/edx/github.in
@@ -63,9 +63,6 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752
 # back into the upstream code.
 git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e#egg=django-ratelimit-backend
 
-# original repo is not maintained any more.
-git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12
-
 # Our libraries:
 -e git+https://github.com/edx/[email protected]#egg=codejail==3.1.3
 -e git+https://github.com/edx/[email protected]#egg=rate-xblock

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -393,8 +393,6 @@ django-ratelimit==3.0.1
     # via -r requirements/edx/base.txt
 django-ratelimit-backend @ git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e
     # via -r requirements/edx/base.txt
-django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
-    # via -r requirements/edx/base.txt
 django-sekizai==2.0.0
     # via
     #   -r requirements/edx/base.txt
@@ -865,6 +863,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==2.0.1
     # via -r requirements/edx/base.txt
+openedx-django-require==2.1.0
+    # via -r requirements/edx/base.txt
 openedx-events==0.6.0
     # via -r requirements/edx/base.txt
 ora2==3.7.2