From b62d7d45fa0254b23f91a17ae8593162c7c6b028 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 17 May 2021 14:36:05 +0500 Subject: [PATCH 1/3] refactor: upgrade django=2.2.23. Fileupload issue fixed. --- lms/djangoapps/badges/tests/test_models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py index e6469dc6a5..bb7e2535fd 100644 --- a/lms/djangoapps/badges/tests/test_models.py +++ b/lms/djangoapps/badges/tests/test_models.py @@ -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(TEST_DATA_DIR / 'badges' / name + '.png', mode='rb')) # lint-amnesty, pylint: disable=bad-option-value, open-builtin @override_settings(MEDIA_ROOT=TEST_DATA_ROOT) From 5c73e5dd8626e4ab913a17a06bc0072ee26c8615 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 17 May 2021 14:59:25 +0500 Subject: [PATCH 2/3] refactor: upgrade django=2.2.23. Fileupload issue fixed. --- lms/djangoapps/badges/tests/test_models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py index bb7e2535fd..6573a21218 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_DIR / '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) From bd90545afe53ab04e01c3bee65617d076026305e Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 17 May 2021 19:29:31 +0500 Subject: [PATCH 3/3] refactor: upgrade django=2.2.23. Fileupload issue fixed. --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/django.txt | 2 +- requirements/edx/doc.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 94b7fab85a..17f405a9f5 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.2.21 +django<2.3 # celery 5.0 has dropped python3.5 support. celery<5.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 93172a7125..6bd9def1dd 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.20 +django==2.2.23 # 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 aefa3c1273..a138db2168 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.23 # 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..a26d7ce443 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1 +1 @@ -django==2.2.20 +django==2.2.23 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 49c74c159a..995bf0bb7e 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.20 +django==2.2.23 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/edx/../constraints.txt