Merge pull request #229 from CUCWD/feature.nutmeg/ztraboo/update-brok…

…en-edx-repos Applied `django-require` package updates needed to successfully build the `openedx` Docker image.
CUCWD · Mar 21, 2024 · afa3b1d · afa3b1d
2 parents 0719c1d + 90505f6
commit afa3b1d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
@@ -174,5 +174,4 @@ xblock-utils                        # Provides utilities used by the Discussion
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
 enmerkar-underscore                 # Implements a underscore extractor for django-babel.
 xblock-drag-and-drop-v2             # Drag and Drop XBlock
-
--r private.txt            # Include our EducateWorkforce specific packages
+openedx-django-require
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -339,8 +339,6 @@ django-pyfs==3.2.0
     # via -r requirements/edx/base.in
 django-ratelimit==3.0.1
     # via -r requirements/edx/base.in
-django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776
-    # via -r requirements/edx/github.in
 django-sekizai==3.0.1
     # via
     #   -r requirements/edx/base.in
@@ -737,6 +735,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==3.0.1
     # via -r requirements/edx/base.in
+openedx-django-require==2.1.0
+    # via -r requirements/edx/base.in
 openedx-events==0.8.1
     # via -r requirements/edx/base.in
 openedx-filters==0.7.0

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -440,8 +440,6 @@ django-pyfs==3.2.0
     # via -r requirements/edx/testing.txt
 django-ratelimit==3.0.1
     # 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==3.0.1
     # via
     #   -r requirements/edx/testing.txt
@@ -979,6 +977,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==3.0.1
     # via -r requirements/edx/testing.txt
+openedx-django-require==2.1.0
+    # via -r requirements/edx/testing.txt
 openedx-events==0.8.1
     # via -r requirements/edx/testing.txt
 openedx-filters==0.7.0

diff --git a/requirements/edx/github.in b/requirements/edx/github.in
@@ -59,9 +59,6 @@
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
 
-# 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/openedx/[email protected]#egg=blockstore==1.2.1
 -e git+https://github.com/edx/[email protected]#egg=codejail==3.1.3

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -423,8 +423,6 @@ django-pyfs==3.2.0
     # via -r requirements/edx/base.txt
 django-ratelimit==3.0.1
     # 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==3.0.1
     # via
     #   -r requirements/edx/base.txt
@@ -923,6 +921,8 @@ oauthlib==3.0.1
     #   social-auth-core
 openedx-calc==3.0.1
     # via -r requirements/edx/base.txt
+openedx-django-require==2.1.0
+    # via -r requirements/edx/base.txt
 openedx-events==0.8.1
     # via -r requirements/edx/base.txt
 openedx-filters==0.7.0