From 4e84d435c1043d79270f29c001ebc763d48628fa Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 29 May 2020 11:37:46 +0500 Subject: [PATCH] BOM-1637 rename djang-babel to enmarker upgrade the reqs --- conf/locale/babel_underscore.cfg | 2 +- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.in | 1 + requirements/edx/base.txt | 2 ++ requirements/edx/github.in | 8 -------- requirements/edx/paver.txt | 4 ++-- scripts/xblock/requirements.txt | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/conf/locale/babel_underscore.cfg b/conf/locale/babel_underscore.cfg index 0769f65f28..9f75e777b1 100644 --- a/conf/locale/babel_underscore.cfg +++ b/conf/locale/babel_underscore.cfg @@ -3,4 +3,4 @@ input_encoding = utf-8 [extractors] -underscore = django_babel_underscore:extract +underscore = enmerkar_underscore:extract diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 75895559eb..9b7a259baf 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -11,6 +11,6 @@ joblib==0.14.1 # via -c requirements/edx-sandbox/../constraints.txt, lxml==4.5.0 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.in nltk==3.5 # via -r requirements/edx-sandbox/shared.in pycparser==2.20 # via cffi -regex==2020.5.14 # via nltk +regex==2020.6.8 # via nltk six==1.15.0 # via cryptography tqdm==4.46.1 # via nltk diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 3046d664e4..f2749757cd 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -159,4 +159,5 @@ web-fragments # Provides the ability to render fragments o XBlock # Courseware component architecture xblock-utils # Provides utilities used by the Discussion XBlock xss-utils # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations +enmerkar-underscore # Implements a underscore extractor for django-babel. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2f5607c84c..c574f769a1 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -119,6 +119,8 @@ edx-user-state-client==1.2.0 # via -r requirements/edx/base.in edx-when==1.2.4 # via -r requirements/edx/base.in, edx-proctoring edxval==1.3.5 # via -r requirements/edx/base.in elasticsearch==1.9.0 # via edx-search +enmerkar-underscore==1.0.0 # via -r requirements/edx/base.in +enmerkar==0.7.1 # via enmerkar-underscore enum34==1.1.10 # via edxval event-tracking==0.3.2 # via -r requirements/edx/base.in, edx-proctoring, edx-search fs-s3fs==0.1.8 # via -r requirements/edx/base.in, django-pyfs diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 0bcaee9ba0..6fee8dceed 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -61,14 +61,6 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does -e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit -# Underscore template extractor for django-babel/enmerkar -# This fork adds django>1.11 and django<3 compatibility. -git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 - -# Internationalization utilities -# Our django-babel-underscore fork above does not yet work with the newer enmerkar PyPI releases (BOM-1637) -git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 - # Forked to get Django 2.2 support from unreleased master branch from social-app-django repo. # This can be removed once an official social-auth-app-django Pypi release with Django 2.2 support is available in the future. -e git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 1321da6e83..b96b12c8f5 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,11 +4,11 @@ # # make upgrade # -certifi==2020.4.5.1 # via requests +certifi==2020.4.5.2 # via requests chardet==3.0.4 # via requests edx-opaque-keys==2.1.0 # via -r requirements/edx/paver.in idna==2.9 # via requests -importlib-metadata==1.6.0 # via path +importlib-metadata==1.6.1 # via path lazy==1.4 # via -r requirements/edx/paver.in libsass==0.10.0 # via -r requirements/edx/paver.in markupsafe==1.1.1 # via -r requirements/edx/paver.in diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index a9987ce0be..ace44bd929 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2020.4.5.1 # via requests +certifi==2020.4.5.2 # via requests chardet==3.0.4 # via requests idna==2.9 # via requests requests==2.23.0 # via -r scripts/xblock/requirements.in