From 5e43d6aa22a73bd956fde956da022b7ba7ff5fef Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 2 Mar 2020 15:23:13 -0500 Subject: [PATCH 1/3] Add shortuuid requirement explicitly. --- requirements/edx/base.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 8708f323fa..0897ef2ed5 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -138,6 +138,7 @@ rules # Django extension for rules-based authoriza simplejson sailthru-client==2.2.3 # For Sailthru integration Shapely # Geometry library, used for image click regions in capa +shortuuid # used in openedx/core/lib/hash_utils to generate object hashes. six # Utilities for supporting Python 2 & 3 in the same codebase sortedcontainers # Provides SortedKeyList, used for lists of XBlock assets sqlparse # Required by Django to run migrations.RunSQL From aa2920521fbacb4a3c506d11648a4a91410999d3 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 2 Mar 2020 15:23:58 -0500 Subject: [PATCH 2/3] Run make upgrade. --- requirements/edx/base.txt | 5 +++-- requirements/edx/development.txt | 5 +++-- requirements/edx/testing.txt | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 59ae006d7b..9f3f029086 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -110,14 +110,14 @@ edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/paver.txt, edx-bulk-gr edx-organizations==4.0.0 # via -r requirements/edx/base.in edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in edx-proctoring==2.3.0 # via -r requirements/edx/base.in, edx-proctoring-proctortrack -edx-rbac==1.1.0 # via edx-enterprise +edx-rbac==1.1.1 # via edx-enterprise edx-rest-api-client==4.0.1 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring edx-search==1.3.3 # via -r requirements/edx/base.in 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.2 # via -r requirements/edx/base.in, edx-proctoring +edx-when==1.0.3 # 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 @@ -218,6 +218,7 @@ sailthru-client==2.2.3 # via -r requirements/edx/base.in, edx-ace scipy==1.4.1 # via calc, chem semantic-version==2.8.4 # via edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.in +shortuuid==0.5.0 # via -r requirements/edx/base.in simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils six==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, calc, cryptography, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, nltk, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 58bc43fcf8..40ee23d738 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -123,7 +123,7 @@ edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/testing.txt, edx-bulk- edx-organizations==4.0.0 # via -r requirements/edx/testing.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt edx-proctoring==2.3.0 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack -edx-rbac==1.1.0 # via -r requirements/edx/testing.txt, edx-enterprise +edx-rbac==1.1.1 # via -r requirements/edx/testing.txt, edx-enterprise edx-rest-api-client==4.0.1 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring edx-search==1.3.3 # via -r requirements/edx/testing.txt edx-sga==0.10.0 # via -r requirements/edx/testing.txt @@ -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.2 # via -r requirements/edx/testing.txt, edx-proctoring +edx-when==1.0.3 # 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 @@ -277,6 +277,7 @@ scipy==1.4.1 # via -r requirements/edx/testing.txt, calc, chem selenium==3.141.0 # via -r requirements/edx/testing.txt, bok-choy semantic-version==2.8.4 # via -r requirements/edx/testing.txt, edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/testing.txt +shortuuid==0.5.0 # via -r requirements/edx/testing.txt simplejson==3.17.0 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.txt six==1.14.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, calc, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, nltk, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index b8e1e51ae8..d5825498ac 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -119,14 +119,14 @@ edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/base.txt, edx-bulk-gra edx-organizations==4.0.0 # via -r requirements/edx/base.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt edx-proctoring==2.3.0 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack -edx-rbac==1.1.0 # via -r requirements/edx/base.txt, edx-enterprise +edx-rbac==1.1.1 # via -r requirements/edx/base.txt, edx-enterprise edx-rest-api-client==4.0.1 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring edx-search==1.3.3 # via -r requirements/edx/base.txt 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.2 # via -r requirements/edx/base.txt, edx-proctoring +edx-when==1.0.3 # 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 @@ -265,6 +265,7 @@ scipy==1.4.1 # via -r requirements/edx/base.txt, calc, chem selenium==3.141.0 # via -r requirements/edx/testing.in, bok-choy semantic-version==2.8.4 # via -r requirements/edx/base.txt, edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.txt +shortuuid==0.5.0 # via -r requirements/edx/base.txt simplejson==3.17.0 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.in six==1.14.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, calc, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, nltk, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock From 93b02e5c31e31c492946a4d4fec21cf059ab3ebe Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 2 Mar 2020 16:06:05 -0500 Subject: [PATCH 3/3] Rollback edx-when. --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 9f3f029086..cd14d46b69 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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.2 # 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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 40ee23d738..8765398fdb 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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.2 # 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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d5825498ac..f81c0f718c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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.2 # 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