diff --git a/cms/envs/common.py b/cms/envs/common.py index 8bffb25198..a73d7c1c85 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -906,6 +906,7 @@ CERTIFICATE_TEMPLATE_LANGUAGES = { USE_I18N = True USE_L10N = True +STATICI18N_FILENAME_FUNCTION = 'statici18n.utils.legacy_filename' STATICI18N_ROOT = PROJECT_ROOT / "static" LOCALE_PATHS = _make_locale_paths diff --git a/lms/envs/common.py b/lms/envs/common.py index 0443f9d2ab..10f58599aa 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1274,6 +1274,7 @@ CERTIFICATE_TEMPLATE_LANGUAGES = { USE_I18N = True USE_L10N = True +STATICI18N_FILENAME_FUNCTION = 'statici18n.utils.legacy_filename' STATICI18N_ROOT = PROJECT_ROOT / "static" STATICI18N_OUTPUT_DIR = "js/i18n" diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a5a5f8785e..42c506925b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -14,6 +14,12 @@ django-cors-headers<3.0.0 # Constraining this since the newer versions no longer work with the deprecated MIDDLEWARE_CLASSES setting django-debug-toolbar<2.0 +# Version 1.2.0 dropped support for Django 1.11 +django-oauth-toolkit<1.2.0 + +# Version 1.0.0 dropped support for Django 1.11 simultaneously with adding support for 2.x +django-method-override<1.0.0 + # Version 4.0.0 dropped support for Django < 2.0.1 django-model-utils<4.0.0 diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 54e3575f90..a5266518d7 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -28,8 +28,8 @@ analytics-python # Used for Segment analytics attrs # Reduces boilerplate code involving class attributes -Babel==1.3 # Internationalization utilities, used for date formatting in a few places -bleach==2.1.4 # Allowed-list-based HTML sanitizing library that escapes or strips markup and attributes; used for capa and LTI +Babel # Internationalization utilities, used for date formatting in a few places +bleach # Allowed-list-based HTML sanitizing library that escapes or strips markup and attributes; used for capa and LTI boto==2.39.0 # Deprecated version of the AWS SDK; we should stop using this boto3==1.4.8 # Amazon Web Services SDK for Python botocore==1.8.17 # via boto3, s3transfer @@ -45,21 +45,21 @@ django-crum # Middleware that stores the current request django-fernet-fields # via edx-enterprise (should be added to its setup.py) django-filter==1.0.4 # Allows users to filter Django querysets dynamically django-ipware # Get the client's real IP address -django-method-override==0.1.0 +django-method-override django-model-utils django-mptt>=0.8.6,<0.9 django-mysql==2.4.1 -django-oauth-toolkit<1.2 # Provides oAuth2 capabilities for Django. 1.2+ requires Django 2 and Python 3.5 +django-oauth-toolkit # Provides oAuth2 capabilities for Django django-pipeline django-pyfs django-ratelimit -django-ratelimit-backend==1.1.1 +django-ratelimit-backend django-require django-sekizai django-ses django-simple-history django-splash -django-statici18n==1.4.0 +django-statici18n django-storages django-user-tasks django-waffle==0.12.0 @@ -92,7 +92,6 @@ edx-user-state-client edx-when edxval event-tracking -feedparser==5.1.3 fs==2.0.18 fs-s3fs==0.1.8 geoip2 # Python API for the GeoIP web services and databases diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2114c1e8e7..f6668f726d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -26,10 +26,10 @@ anyjson==0.3.3 # via kombu appdirs==1.4.3 # via fs argh==0.26.2 attrs==19.3.0 -babel==1.3 +babel==2.8.0 beautifulsoup4==4.8.2 # via pynliner billiard==3.3.0.23 # via celery -bleach==2.1.4 +bleach==3.1.0 boto3==1.4.8 boto==2.39.0 botocore==1.8.17 @@ -63,7 +63,7 @@ django-crum==0.7.5 django-fernet-fields==0.6 django-filter==1.0.4 django-ipware==2.1.0 -django-method-override==0.1.0 +django-method-override==0.2.0 django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 # via edx-enterprise @@ -73,14 +73,14 @@ django-oauth-toolkit==1.1.3 django-object-actions==2.0.0 # via edx-enterprise django-pipeline==1.7.0 django-pyfs==2.1 -django-ratelimit-backend==1.1.1 +django-ratelimit-backend==2.0 django-ratelimit==2.0.0 django-require==1.0.11 django-sekizai==1.0.0 django-ses==0.8.13 django-simple-history==2.8.0 django-splash==0.2.5 -django-statici18n==1.4.0 +django-statici18n==1.8.3 django-storages==1.8 django-user-tasks==0.3.0 django-waffle==0.12.0 @@ -124,7 +124,6 @@ edxval==1.2.0 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 # via edxval event-tracking==0.3.0 -feedparser==5.1.3 fs-s3fs==0.1.8 fs==2.0.18 future==0.18.2 # via django-ses, edx-celeryutils, edx-enterprise, pyjwkest @@ -240,7 +239,7 @@ user-util==0.1.5 voluptuous==0.11.7 watchdog==0.9.0 web-fragments==0.3.1 -webencodings==0.5.1 # via html5lib +webencodings==0.5.1 # via bleach, html5lib webob==1.8.5 # via xblock wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 1b13246d1b..98eacb0600 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -30,10 +30,10 @@ argh==0.26.2 astroid==1.5.3 attrs==19.3.0 aws-xray-sdk==0.95 -babel==1.3 +babel==2.8.0 beautifulsoup4==4.8.2 billiard==3.3.0.23 -bleach==2.1.4 +bleach==3.1.0 bok-choy==1.0.1 boto3==1.4.8 boto==2.39.0 @@ -76,7 +76,7 @@ django-debug-toolbar==1.11 django-fernet-fields==0.6 django-filter==1.0.4 django-ipware==2.1.0 -django-method-override==0.1.0 +django-method-override==0.2.0 django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 @@ -86,14 +86,14 @@ django-oauth-toolkit==1.1.3 django-object-actions==2.0.0 django-pipeline==1.7.0 django-pyfs==2.1 -django-ratelimit-backend==1.1.1 +django-ratelimit-backend==2.0 django-ratelimit==2.0.0 django-require==1.0.11 django-sekizai==1.0.0 django-ses==0.8.13 django-simple-history==2.8.0 django-splash==0.2.5 -django-statici18n==1.4.0 +django-statici18n==1.8.3 django-storages==1.8 django-user-tasks==0.3.0 django-waffle==0.12.0 @@ -144,7 +144,6 @@ event-tracking==0.3.0 execnet==1.7.1 factory_boy==2.8.1 faker==3.0.0 -feedparser==5.1.3 filelock==3.0.12 flake8-polyfill==1.0.2 flake8==3.7.9 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5441283a17..c44e67036c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -29,10 +29,10 @@ argh==0.26.2 astroid==1.5.3 # via pylint, pylint-celery attrs==19.3.0 aws-xray-sdk==0.95 # via moto -babel==1.3 +babel==2.8.0 beautifulsoup4==4.8.2 billiard==3.3.0.23 -bleach==2.1.4 +bleach==3.1.0 bok-choy==1.0.1 boto3==1.4.8 boto==2.39.0 @@ -74,7 +74,7 @@ django-crum==0.7.5 django-fernet-fields==0.6 django-filter==1.0.4 django-ipware==2.1.0 -django-method-override==0.1.0 +django-method-override==0.2.0 django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 @@ -84,14 +84,14 @@ django-oauth-toolkit==1.1.3 django-object-actions==2.0.0 django-pipeline==1.7.0 django-pyfs==2.1 -django-ratelimit-backend==1.1.1 +django-ratelimit-backend==2.0 django-ratelimit==2.0.0 django-require==1.0.11 django-sekizai==1.0.0 django-ses==0.8.13 django-simple-history==2.8.0 django-splash==0.2.5 -django-statici18n==1.4.0 +django-statici18n==1.8.3 django-storages==1.8 django-user-tasks==0.3.0 django-waffle==0.12.0 @@ -140,7 +140,6 @@ event-tracking==0.3.0 execnet==1.7.1 # via pytest-xdist factory_boy==2.8.1 faker==3.0.0 # via factory-boy -feedparser==5.1.3 filelock==3.0.12 # via tox flake8-polyfill==1.0.2 # via radon flake8==3.7.9 # via flake8-polyfill