Skip to content

ran make upgrade to bump edx-enterprise version #23925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chavesj merged 2 commits into from
May 6, 2020
Merged

ran make upgrade to bump edx-enterprise version #23925

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69f407b
ran make upgrade to bump edx-enterprise version
May 6, 2020
7f115fe
Merge branch 'master' of github.com:edx/edx-platform into chavesj/ent…
May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ cffi==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, c
chardet==3.0.4 # via -r requirements/edx/paver.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/github.in
click==7.1.2 # via -r requirements/edx/../edx-sandbox/shared.txt, code-annotations, nltk, user-util
code-annotations==0.3.3 # via edx-enterprise
code-annotations==0.3.4 # via edx-enterprise
contextlib2==0.6.0.post1 # via -r requirements/edx/base.in
coreapi==2.3.3 # via drf-yasg
coreschema==0.0.4 # via coreapi, drf-yasg
Expand All @@ -66,7 +66,7 @@ django-filter==2.2.0 # via -r requirements/edx/base.in, edx-enterprise
django-ipware==2.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring
django-js-asset==1.2.2 # via django-mptt
git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4 # via -r requirements/edx/github.in
django-model-utils==3.2.0 # via -r requirements/edx/base.in, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
django-model-utils==4.0.0 # via -r requirements/edx/base.in, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
django-mptt==0.11.0 # via -r requirements/edx/base.in, django-wiki
django-multi-email-field==0.6.1 # via edx-enterprise
django-mysql==3.5.0 # via -r requirements/edx/base.in
Expand All @@ -92,7 +92,7 @@ docopt==0.6.2 # via xmodule
docutils==0.16 # via botocore
drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, edx-drf-extensions
drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, edx-api-doc-tools
edx-ace==0.1.14 # via -r requirements/edx/base.in
edx-ace==0.1.15 # via -r requirements/edx/base.in
edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/base.in
edx-api-doc-tools==1.2.0 # via -r requirements/edx/base.in
edx-bulk-grades==0.6.8 # via -r requirements/edx/base.in, staff-graded-xblock
Expand All @@ -103,18 +103,18 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.in
edx-django-sites-extensions==2.5.0 # via -r requirements/edx/base.in
edx-django-utils==3.2.2 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
edx-drf-extensions==6.0.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.2.2 # via -r requirements/edx/base.in
edx-i18n-tools==0.5.0 # via ora2
edx-enterprise==3.2.6 # via -r requirements/edx/base.in
edx-i18n-tools==0.5.1 # via ora2
edx-milestones==0.3.0 # via -r requirements/edx/base.in
edx-opaque-keys[django]==2.1.0 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule
edx-organizations==5.2.0 # via -r requirements/edx/base.in
edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in
edx-proctoring==2.4.0 # via -r requirements/edx/base.in, edx-proctoring-proctortrack
edx-rbac==1.1.3 # via edx-enterprise
edx-rbac==1.2.0 # via edx-enterprise
edx-rest-api-client==5.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring
edx-search==1.3.4 # via -r requirements/edx/base.in
edx-sga==0.10.0 # via -r requirements/edx/base.in
edx-submissions==3.1.3 # via -r requirements/edx/base.in, ora2
edx-submissions==3.1.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.2.3 # via -r requirements/edx/base.in, edx-proctoring
Expand Down Expand Up @@ -156,7 +156,7 @@ mako==1.0.2 # via -r requirements/edx/base.in, acid-xblock, lti-co
markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-wiki, staff-graded-xblock, xblock-poll
markey==0.8 # via django-babel-underscore
markupsafe==1.1.1 # via -r requirements/edx/paver.txt, chem, jinja2, mako, xblock
maxminddb==1.5.3 # via geoip2
maxminddb==1.5.4 # via geoip2
mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll
git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/github.in
mongoengine==0.10.0 # via -r requirements/edx/base.in
Expand Down Expand Up @@ -207,7 +207,7 @@ pytz==2020.1 # via -r requirements/edx/base.in, babel, capa, celery
pyuca==1.2 # via -r requirements/edx/base.in
pyyaml==5.3.1 # via -r requirements/edx/base.in, code-annotations, edx-django-release-util, edx-i18n-tools, xblock
random2==1.0.1 # via -r requirements/edx/base.in
recommender-xblock==1.4.7 # via -r requirements/edx/base.in
recommender-xblock==1.4.8 # via -r requirements/edx/base.in
redis==2.10.6 # via -r requirements/edx/base.in
regex==2020.4.4 # via -r requirements/edx/../edx-sandbox/shared.txt, nltk
requests-oauthlib==1.3.0 # via -r requirements/edx/base.in, social-auth-core
Expand Down Expand Up @@ -250,7 +250,7 @@ wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requi
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/github.in
git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/github.in
xblock-utils==2.0.0 # via -r requirements/edx/base.in, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive
xblock==1.3.0 # via -r requirements/edx/base.in, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xblock==1.3.1 # via -r requirements/edx/base.in, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.3 # via python3-saml
xss-utils==0.1.3 # via -r requirements/edx/base.in
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, importlib-metadata
Expand Down
20 changes: 10 additions & 10 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ chardet==3.0.4 # via -r requirements/edx/testing.txt, pdfminer.six, p
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/testing.txt
click-log==0.3.2 # via -r requirements/edx/testing.txt, edx-lint
click==7.1.2 # via -r requirements/edx/development.in, -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, click-log, code-annotations, edx-lint, nltk, pip-tools, user-util
code-annotations==0.3.3 # via -r requirements/edx/testing.txt, edx-enterprise
code-annotations==0.3.4 # via -r requirements/edx/testing.txt, edx-enterprise
colorama==0.4.1 # via -r requirements/edx/testing.txt, radon
contextlib2==0.6.0.post1 # via -r requirements/edx/testing.txt
coreapi==2.3.3 # via -r requirements/edx/testing.txt, drf-yasg
Expand Down Expand Up @@ -78,7 +78,7 @@ django-filter==2.2.0 # via -r requirements/edx/testing.txt, edx-enterprise
django-ipware==2.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring
django-js-asset==1.2.2 # via -r requirements/edx/testing.txt, django-mptt
git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4 # via -r requirements/edx/testing.txt
django-model-utils==3.2.0 # via -r requirements/edx/testing.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
django-model-utils==4.0.0 # via -r requirements/edx/testing.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
django-mptt==0.11.0 # via -r requirements/edx/testing.txt, django-wiki
django-multi-email-field==0.6.1 # via -r requirements/edx/testing.txt, edx-enterprise
django-mysql==3.5.0 # via -r requirements/edx/testing.txt
Expand All @@ -104,7 +104,7 @@ docopt==0.6.2 # via -r requirements/edx/testing.txt, xmodule
docutils==0.16 # via -r requirements/edx/testing.txt, botocore, m2r, sphinx
drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-drf-extensions
drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-api-doc-tools
edx-ace==0.1.14 # via -r requirements/edx/testing.txt
edx-ace==0.1.15 # via -r requirements/edx/testing.txt
edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/testing.txt
edx-api-doc-tools==1.2.0 # via -r requirements/edx/testing.txt
edx-bulk-grades==0.6.8 # via -r requirements/edx/testing.txt, staff-graded-xblock
Expand All @@ -115,20 +115,20 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt
edx-django-sites-extensions==2.5.0 # via -r requirements/edx/testing.txt
edx-django-utils==3.2.2 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
edx-drf-extensions==6.0.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.2.2 # via -r requirements/edx/testing.txt
edx-i18n-tools==0.5.0 # via -r requirements/edx/testing.txt, ora2
edx-enterprise==3.2.6 # via -r requirements/edx/testing.txt
edx-i18n-tools==0.5.1 # via -r requirements/edx/testing.txt, ora2
edx-lint==1.4.1 # via -r requirements/edx/testing.txt
edx-milestones==0.3.0 # via -r requirements/edx/testing.txt
edx-opaque-keys[django]==2.1.0 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule
edx-organizations==5.2.0 # via -r requirements/edx/testing.txt
edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt
edx-proctoring==2.4.0 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack
edx-rbac==1.1.3 # via -r requirements/edx/testing.txt, edx-enterprise
edx-rbac==1.2.0 # via -r requirements/edx/testing.txt, edx-enterprise
edx-rest-api-client==5.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring
edx-search==1.3.4 # via -r requirements/edx/testing.txt
edx-sga==0.10.0 # via -r requirements/edx/testing.txt
edx-sphinx-theme==1.5.0 # via -r requirements/edx/development.in
edx-submissions==3.1.3 # via -r requirements/edx/testing.txt, ora2
edx-submissions==3.1.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.2.3 # via -r requirements/edx/testing.txt, edx-proctoring
Expand Down Expand Up @@ -188,7 +188,7 @@ mando==0.6.4 # via -r requirements/edx/testing.txt, radon
markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-wiki, staff-graded-xblock, xblock-poll
markey==0.8 # via -r requirements/edx/testing.txt, django-babel-underscore
markupsafe==1.1.1 # via -r requirements/edx/testing.txt, chem, jinja2, mako, xblock
maxminddb==1.5.3 # via -r requirements/edx/testing.txt, geoip2
maxminddb==1.5.4 # via -r requirements/edx/testing.txt, geoip2
mccabe==0.6.1 # via -r requirements/edx/testing.txt, flake8, pylint
mistune==0.8.4 # via m2r
mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll
Expand Down Expand Up @@ -265,7 +265,7 @@ pywatchman==1.4.1 # via -r requirements/edx/development.in
pyyaml==5.3.1 # via -r requirements/edx/testing.txt, code-annotations, edx-django-release-util, edx-i18n-tools, sphinxcontrib-openapi, xblock
radon==4.1.0 # via -r requirements/edx/testing.txt
random2==1.0.1 # via -r requirements/edx/testing.txt
recommender-xblock==1.4.7 # via -r requirements/edx/testing.txt
recommender-xblock==1.4.8 # via -r requirements/edx/testing.txt
redis==2.10.6 # via -r requirements/edx/testing.txt
regex==2020.4.4 # via -r requirements/edx/testing.txt, nltk
requests-oauthlib==1.3.0 # via -r requirements/edx/testing.txt, social-auth-core
Expand Down Expand Up @@ -329,7 +329,7 @@ wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requi
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/testing.txt
git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/testing.txt
xblock-utils==2.0.0 # via -r requirements/edx/testing.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive
xblock==1.3.0 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xblock==1.3.1 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.3 # via -r requirements/edx/testing.txt, python3-saml
xss-utils==0.1.3 # via -r requirements/edx/testing.txt
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata, importlib-resources
Expand Down
1 change: 1 addition & 0 deletions requirements/edx/testing.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pytest-cov # pytest plugin for measuring code coverage
git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0
pytest-django # Django support for pytest
pytest-json-report # Output json formatted warnings after running pytest
pytest-metadata==1.8.0 # To prevent 'make upgrade' failure, dependency of pytest-json-report
pytest-randomly # pytest plugin to randomly order tests
pytest-xdist # Parallel execution of tests on multiple CPU cores or hosts
radon # Calculates cyclomatic complexity of Python code (code quality utility)
Expand Down
Loading