Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23305 from cpennington/upgrade-edx-when

Browse Source 
Upgrade edx when
This commit is contained in:
Calen Pennington
2020-03-05 14:24:23 -05:00
committed by GitHub
parent f26ffb453b fbd7507af5
commit 667d7606ee
8 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -85,10 +85,13 @@ REQ_FILES = \
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the pip requirements files to use the latest releases satisfying our constraints
pip install -qr requirements/edx/pip-tools.txt
@for f in $(REQ_FILES); do \
@ export REBUILD='--rebuild'; \
for f in $(REQ_FILES); do \
echo ; \
echo "== $$f ===============================" ; \
pip-compile -v --no-emit-trusted-host --no-index --rebuild --upgrade -o $$f.txt $$f.in || exit 1; \
echo "pip-compile -v --no-emit-trusted-host --no-index $$REBUILD --upgrade -o $$f.txt $$f.in"; \
pip-compile -v --no-emit-trusted-host --no-index $$REBUILD --upgrade -o $$f.txt $$f.in || exit 1; \
export REBUILD=''; \
done
# Post process all of the files generated above to work around open pip-tools issues
scripts/post-pip-compile.sh $(REQ_FILES:=.txt)

8
lms/djangoapps/courseware/tests/test_views.py
View File

@@ -1495,8 +1495,8 @@ class ProgressPageTests(ProgressPageBaseTests):
self.assertContains(resp, u"Download Your Certificate")
@ddt.data(
(True, 57),
(False, 56)
(True, 54),
(False, 53),
)
@ddt.unpack
def test_progress_queries_paced_courses(self, self_paced, query_count):
@@ -1509,8 +1509,8 @@ class ProgressPageTests(ProgressPageBaseTests):
@patch.dict(settings.FEATURES, {'ASSUME_ZERO_GRADE_IF_ABSENT_FOR_ALL_TESTS': False})
@ddt.data(
(False, 65, 44),
(True, 56, 39)
(False, 62, 41),
(True, 53, 36)
)
@ddt.unpack
def test_progress_queries(self, enable_waffle, initial, subsequent):

2
requirements/edx-sandbox/py35.txt
View File

@@ -20,7 +20,7 @@ mpmath==1.1.0 # via sympy
networkx==2.2 # via -r requirements/edx-sandbox/py35.in
nltk==3.4.5 # via -r requirements/edx-sandbox/shared.txt, chem
numpy==1.16.5 # via -r requirements/edx-sandbox/py35.in, calc, chem, matplotlib, scipy
pycparser==2.19 # via -r requirements/edx-sandbox/shared.txt, cffi
pycparser==2.20 # via -r requirements/edx-sandbox/shared.txt, cffi
pyparsing==2.2.0 # via -r requirements/edx-sandbox/py35.in, calc, chem, matplotlib
python-dateutil==2.8.1 # via matplotlib
pytz==2019.3 # via matplotlib

2
requirements/edx-sandbox/shared.txt
View File

@@ -8,5 +8,5 @@ cffi==1.14.0 # via cryptography
cryptography==2.8 # via -r requirements/edx-sandbox/shared.in
lxml==4.5.0 # via -r requirements/edx-sandbox/shared.in
nltk==3.4.5 # via -r requirements/edx-sandbox/shared.in
pycparser==2.19 # via cffi
pycparser==2.20 # via cffi
six==1.14.0 # via cryptography, nltk

6
requirements/edx/base.txt
View File

@@ -85,7 +85,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/base.in
django-waffle==0.18.0 # via -r requirements/edx/base.in, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/base.in, edx-proctoring
django==1.11.28 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
django==1.11.29 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
djangorestframework-jwt==1.11.0 # via -r requirements/edx/base.in, edx-drf-extensions
djangorestframework-xml==1.4.0 # via edx-enterprise
djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
@@ -117,7 +117,7 @@ edx-sga==0.10.0 # via -r requirements/edx/base.in
edx-submissions==3.0.4 # via -r requirements/edx/base.in, ora2
edx-tincan-py35==0.0.5 # via edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.in
edx-when==1.0.3 # via -r requirements/edx/base.in, edx-proctoring
edx-when==1.0.4 # via -r requirements/edx/base.in, edx-proctoring
edxval==1.2.4 # via -r requirements/edx/base.in
elasticsearch==1.9.0 # via edx-search
enum34==1.1.9 # via edxval
@@ -183,7 +183,7 @@ psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils,
py2neo==3.1.2 # via -r requirements/edx/base.in
pycontracts==1.8.12 # via -r requirements/edx/base.in, edx-user-state-client
pycountry==19.8.18 # via -r requirements/edx/base.in
pycparser==2.19 # via -r requirements/edx/../edx-sandbox/shared.txt, cffi
pycparser==2.20 # via -r requirements/edx/../edx-sandbox/shared.txt, cffi
pycryptodome==3.9.7 # via pdfminer.six
pycryptodomex==3.9.7 # via -r requirements/edx/base.in, edx-proctoring, pyjwkest
pygments==2.5.2 # via -r requirements/edx/base.in

8
requirements/edx/development.txt
View File

@@ -97,7 +97,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/testing.txt
django-waffle==0.18.0 # via -r requirements/edx/testing.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/testing.txt, edx-proctoring
django==1.11.28 # via -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
django==1.11.29 # via -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
djangorestframework-jwt==1.11.0 # via -r requirements/edx/testing.txt, edx-drf-extensions
djangorestframework-xml==1.4.0 # via -r requirements/edx/testing.txt, edx-enterprise
djangorestframework==3.9.4 # via -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
@@ -131,7 +131,7 @@ edx-sphinx-theme==1.5.0 # via -r requirements/edx/development.in
edx-submissions==3.0.4 # via -r requirements/edx/testing.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/testing.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/testing.txt
edx-when==1.0.3 # via -r requirements/edx/testing.txt, edx-proctoring
edx-when==1.0.4 # via -r requirements/edx/testing.txt, edx-proctoring
edxval==1.2.4 # via -r requirements/edx/testing.txt
elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search
entrypoints==0.3 # via -r requirements/edx/testing.txt, flake8
@@ -223,7 +223,7 @@ py==1.8.1 # via -r requirements/edx/testing.txt, pytest, tox
pycodestyle==2.5.0 # via -r requirements/edx/testing.txt, flake8
pycontracts==1.8.12 # via -r requirements/edx/testing.txt, edx-user-state-client
pycountry==19.8.18 # via -r requirements/edx/testing.txt
pycparser==2.19 # via -r requirements/edx/testing.txt, cffi
pycparser==2.20 # via -r requirements/edx/testing.txt, cffi
pycryptodome==3.9.7 # via -r requirements/edx/testing.txt, pdfminer.six
pycryptodomex==3.9.7 # via -r requirements/edx/testing.txt, edx-proctoring, pyjwkest
pyflakes==2.1.1 # via -r requirements/edx/testing.txt, flake8
@@ -313,7 +313,7 @@ unidiff==0.5.5 # via -r requirements/edx/testing.txt, coverage-pytest
uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg
urllib3==1.25.8 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client
user-util==0.1.5 # via -r requirements/edx/testing.txt
virtualenv==20.0.7 # via -r requirements/edx/testing.txt, tox
virtualenv==20.0.8 # via -r requirements/edx/testing.txt, tox
voluptuous==0.11.7 # via -r requirements/edx/testing.txt, ora2
vulture==1.3 # via -r requirements/edx/development.in
watchdog==0.10.2 # via -r requirements/edx/testing.txt

2
requirements/edx/django.txt
View File

@@ -1,2 +1,2 @@
django-oauth-toolkit==1.1.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django==1.11.28 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
django==1.11.29 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils

6
requirements/edx/testing.txt
View File

@@ -126,7 +126,7 @@ edx-sga==0.10.0 # via -r requirements/edx/base.txt
edx-submissions==3.0.4 # via -r requirements/edx/base.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/base.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.txt
edx-when==1.0.3 # via -r requirements/edx/base.txt, edx-proctoring
edx-when==1.0.4 # via -r requirements/edx/base.txt, edx-proctoring
edxval==1.2.4 # via -r requirements/edx/base.txt
elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search
entrypoints==0.3 # via flake8
@@ -213,7 +213,7 @@ py==1.8.1 # via pytest, tox
pycodestyle==2.5.0 # via -r requirements/edx/testing.in, flake8
pycontracts==1.8.12 # via -r requirements/edx/base.txt, edx-user-state-client
pycountry==19.8.18 # via -r requirements/edx/base.txt
pycparser==2.19 # via -r requirements/edx/base.txt, cffi
pycparser==2.20 # via -r requirements/edx/base.txt, cffi
pycryptodome==3.9.7 # via -r requirements/edx/base.txt, pdfminer.six
pycryptodomex==3.9.7 # via -r requirements/edx/base.txt, edx-proctoring, pyjwkest
pyflakes==2.1.1 # via flake8
@@ -291,7 +291,7 @@ unidiff==0.5.5 # via -r requirements/edx/testing.in, coverage-pytest-
uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg
urllib3==1.25.8 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client
user-util==0.1.5 # via -r requirements/edx/base.txt
virtualenv==20.0.7 # via tox
virtualenv==20.0.8 # via tox
voluptuous==0.11.7 # via -r requirements/edx/base.txt, ora2
watchdog==0.10.2 # via -r requirements/edx/base.txt
wcwidth==0.1.8 # via pytest