chore: upgrade Django to 2.2.24 (#27851)

This was delayed because we needed the fix on 93cd185.
This commit is contained in:
David Ormsbee
2021-06-07 12:54:01 -04:00
committed by GitHub
parent 0b84c86b36
commit 3ef905c79b
6 changed files with 7 additions and 8 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1 +1 @@
django==2.2.20
django==2.2.24