diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py index 256bf8972b..154dd74704 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 +from lms.djangoapps.certificates.tests.test_models import TEST_DATA_ROOT, TEST_DATA_DIR 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(TEST_DATA_ROOT / 'badges' / name + '.png', mode='rb')) # lint-amnesty, pylint: disable=bad-option-value, open-builtin + return ImageFile(open(f'{TEST_DATA_DIR}/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 114241d0ce..28914fa08a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,8 +12,8 @@ # This file contains all common constraints for edx-repos -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt -# latest version breaks the tests. -django<2.2.21 +# edx-platform currently only supported for Django 2.2.x +django<2.3 # We do not support version django-config-models<1.0.0 django-config-models>=1.0.0 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index a4abaf76fc..46b78f4b9b 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -62,7 +62,6 @@ numpy==1.16.5 # chem # matplotlib # openedx-calc - # scipy openedx-calc==1.0.9 # via -r requirements/edx-sandbox/py35.in pycparser==2.20 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index badd068d59..f79f87f966 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -287,7 +287,7 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-proctoring -django==2.2.20 +django==2.2.24 # 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 d71ff1f5d2..a9f55922ea 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.20 +django==2.2.24 # 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 c957454a76..f44fd3316c 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1 +1 @@ -django==2.2.20 +django==2.2.24