From 2376b3d124bfeeb6924955649758cc188601dbce Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Mon, 17 May 2021 16:33:36 -0400 Subject: [PATCH] Revert "refactor: upgrade django=2.2.23. Fileupload issue fixed." --- lms/djangoapps/badges/tests/test_models.py | 4 ++-- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/django.txt | 2 +- requirements/edx/doc.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py index 6573a21218..e6469dc6a5 100644 --- a/lms/djangoapps/badges/tests/test_models.py +++ b/lms/djangoapps/badges/tests/test_models.py @@ -23,7 +23,7 @@ from lms.djangoapps.badges.models import ( validate_badge_image ) from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory, BadgeClassFactory, RandomBadgeClassFactory -from lms.djangoapps.certificates.tests.test_models import TEST_DATA_ROOT, TEST_DATA_DIR +from lms.djangoapps.certificates.tests.test_models import TEST_DATA_ROOT from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory @@ -32,7 +32,7 @@ def get_image(name): """ Get one of the test images from the test data directory. """ - return ImageFile(open(f'{TEST_DATA_DIR}/badges/{name}.png', mode='rb')) # lint-amnesty, pylint: disable=bad-option-value, open-builtin + return ImageFile(open(TEST_DATA_ROOT / 'badges' / name + '.png', mode='rb')) # lint-amnesty, pylint: disable=bad-option-value, open-builtin @override_settings(MEDIA_ROOT=TEST_DATA_ROOT) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 17f405a9f5..94b7fab85a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -13,7 +13,7 @@ -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # latest version breaks the tests. -django<2.3 +django<2.2.21 # celery 5.0 has dropped python3.5 support. celery<5.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 894c265860..4b903820d7 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -290,7 +290,7 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-proctoring -django==2.2.23 +django==2.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/edx/../constraints.txt diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 1c7d125824..833b1d5357 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -365,7 +365,7 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-proctoring -django==2.2.23 +django==2.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/edx/../constraints.txt diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index a26d7ce443..c957454a76 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1 +1 @@ -django==2.2.23 +django==2.2.20 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 995bf0bb7e..49c74c159a 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -18,7 +18,7 @@ click==7.1.2 # code-annotations code-annotations==1.1.1 # via -r requirements/edx/doc.in -django==2.2.23 +django==2.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/edx/../constraints.txt