From c1e5ea0b4ef4a858717f7315b5b221e0c2dfa57a Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 14 Sep 2021 23:59:31 +0500 Subject: [PATCH 1/3] fix: `django.contrib.staticfiles.storage.CachedStaticFilesStorage` is removed in django3.1. Using the fix from another fork. --- requirements/edx/base.in | 1 - requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 3 +++ requirements/edx/testing.txt | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 4c3d1897d7..229a1435ed 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -59,7 +59,6 @@ django-oauth-toolkit # Provides oAuth2 capabilities for Django django-pipeline django-pyfs django-ratelimit -django-require django-sekizai django-ses django-simple-history diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a77a965dfb..1cc8e36002 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -325,7 +325,7 @@ django-ratelimit==3.0.1 # via -r requirements/edx/base.in git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/github.in -django-require==1.0.11 +git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # via -r requirements/edx/base.in django-sekizai==2.0.0 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 3c44bfb6c8..c4cb34285d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -414,7 +414,7 @@ django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/testing.txt -django-require==1.0.11 +git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # via -r requirements/edx/testing.txt django-sekizai==2.0.0 # via diff --git a/requirements/edx/github.in b/requirements/edx/github.in index e2205459c9..8f185f47b2 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -63,6 +63,9 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # back into the upstream code. git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 +# original repo is not maintained any more. +git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 + # Our libraries: -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 -e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 262f737b84..75979e287c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -397,7 +397,7 @@ django-ratelimit==3.0.1 # via -r requirements/edx/base.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/base.txt -django-require==1.0.11 +git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # via -r requirements/edx/base.txt django-sekizai==2.0.0 # via From 068f367e9e4d4699822337777fb9a8a6ba64de8f Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 21 Sep 2021 00:48:04 +0500 Subject: [PATCH 2/3] fix: `django.contrib.staticfiles.storage.CachedStaticFilesStorage` is removed in django3.1. Using the fix from another fork. --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1cc8e36002..e698bc62e4 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -325,7 +325,7 @@ django-ratelimit==3.0.1 # via -r requirements/edx/base.in git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/github.in -git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # via -r requirements/edx/base.in django-sekizai==2.0.0 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index c4cb34285d..8de3a24859 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -414,7 +414,7 @@ django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/testing.txt -git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # via -r requirements/edx/testing.txt django-sekizai==2.0.0 # via diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 8f185f47b2..fd76ec6104 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -64,7 +64,7 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # original repo is not maintained any more. -git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # Our libraries: -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 75979e287c..0d99eb0e3f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -397,7 +397,7 @@ django-ratelimit==3.0.1 # via -r requirements/edx/base.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/base.txt -git+https://github.com/vtemian/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 # via -r requirements/edx/base.txt django-sekizai==2.0.0 # via From bb706d4b04eaba116e976bdf3105f92d2d7ca764 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 21 Sep 2021 16:06:57 +0500 Subject: [PATCH 3/3] chore: Updating Python Requirements --- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e698bc62e4..a4dd8dca31 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -326,7 +326,7 @@ django-ratelimit==3.0.1 git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a6#egg=django-ratelimit-backend==2.0.1a6 # via -r requirements/edx/github.in git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 - # via -r requirements/edx/base.in + # via -r requirements/edx/github.in django-sekizai==2.0.0 # via # -r requirements/edx/base.in @@ -1012,7 +1012,7 @@ sympy==1.6.2 # symmath tableauserverclient==0.16.0 # via edx-enterprise -testfixtures==6.18.1 +testfixtures==6.18.2 # via edx-enterprise text-unidecode==1.3 # via python-slugify diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 8de3a24859..c32dcaf129 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1423,7 +1423,7 @@ tableauserverclient==0.16.0 # via # -r requirements/edx/testing.txt # edx-enterprise -testfixtures==6.18.1 +testfixtures==6.18.2 # via # -r requirements/edx/testing.txt # edx-enterprise diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 0d99eb0e3f..042e2f3b08 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1316,7 +1316,7 @@ tableauserverclient==0.16.0 # via # -r requirements/edx/base.txt # edx-enterprise -testfixtures==6.18.1 +testfixtures==6.18.2 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in