From 90505f6349070626400220d3651f79f60d228108 Mon Sep 17 00:00:00 2001 From: Zachary Trabookis Date: Thu, 14 Mar 2024 09:06:44 -0400 Subject: [PATCH] fix: Applied `django-require` package updates needed. The original referenced repo https://github.com/edx/django-require?tab=readme-ov-file has been deprecated and moved to the `openedx` organization on Github. Updates required based on comments here. https://discuss.openedx.org/t/please-update-your-git-urls-for-edx-platform-and-several-other-repos/12387 --- requirements/edx/base.in | 3 +-- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/github.in | 3 --- requirements/edx/testing.txt | 4 ++-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 8026c9a967cf..5b7d60435b7c 100644 --- 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 \ No newline at end of file diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a7087f4f7e16..96d65bea9786 100644 --- 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 index 3546ab2b4b87..8a60f0476110 100644 --- 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 index 3ecb7ac3ebc2..cf5605239832 100644 --- 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/blockstore.git@1.2.1#egg=blockstore==1.2.1 -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4a79f1ef1116..293e06823509 100644 --- 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