From 6813414a0ca1c88bd92564482818254aa16b6adb Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 6 Feb 2020 13:28:30 -0500 Subject: [PATCH] Update requirements Fix constraints to not have a lingering pin on edx-when. And add constraint on version of mock that supports python 3.5. And then a general make upgrade. --- requirements/constraints.txt | 4 ++-- requirements/edx/base.txt | 10 +++++----- requirements/edx/development.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 198656189d..7ae271c4b9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -77,5 +77,5 @@ jsonfield2==3.0.3 # django-storages==1.9 breaks contentstore imports django-storages==1.8 -# edx-when==0.7.0 has a breaking change -edx-when==0.6.0 +# mock 4+ requires Python 3.6+ +mock<4 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 45c08db70e..58b3727c1f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -68,7 +68,7 @@ django-js-asset==1.2.2 # via django-mptt django-method-override==0.2.0 django-model-utils==3.0.0 django-mptt==0.11.0 -django-multi-email-field==0.5.1 # via edx-enterprise +django-multi-email-field==0.6.1 # via edx-enterprise django-mysql==3.3.0 git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-oauth-toolkit==1.1.3 @@ -106,7 +106,7 @@ edx-django-release-util==0.3.6 edx-django-sites-extensions==2.4.3 edx-django-utils==2.0.4 edx-drf-extensions==2.4.6 -edx-enterprise==2.3.4 +edx-enterprise==2.3.5 edx-i18n-tools==0.5.0 edx-milestones==0.2.6 edx-oauth2-provider==1.3.1 @@ -118,7 +118,7 @@ edx-rbac==1.0.5 # via edx-enterprise edx-rest-api-client==3.0.2 edx-search==1.2.2 edx-sga==0.10.0 -edx-submissions==3.0.3 +edx-submissions==3.0.4 edx-tincan-py35==0.0.5 # via edx-enterprise edx-user-state-client==1.1.2 edx-when==0.7.0 @@ -144,7 +144,7 @@ itypes==1.1.0 # via coreapi jinja2==2.11.1 # via code-annotations, coreschema jmespath==0.9.4 # via boto3, botocore jsondiff==1.2.0 # via edx-enterprise -jsonfield2==3.0.3 # via edx-celeryutils, edx-proctoring +jsonfield2==3.0.3 # via edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions jsonfield==2.0.2 kombu==3.0.37 # via celery laboratory==1.0.2 @@ -236,7 +236,7 @@ staff-graded-xblock==0.6 stevedore==1.31.0 super-csv==0.9.6 sympy==1.5.1 -testfixtures==6.11.0 # via edx-enterprise +testfixtures==6.12.0 # via edx-enterprise text-unidecode==1.3 # via python-slugify unicodecsv==0.14.1 uritemplate==3.0.1 # via coreapi, drf-yasg diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index d0ecd86a48..ff76d96e2d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -79,7 +79,7 @@ django-js-asset==1.2.2 django-method-override==0.2.0 django-model-utils==3.0.0 django-mptt==0.11.0 -django-multi-email-field==0.5.1 +django-multi-email-field==0.6.1 django-mysql==3.3.0 git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-oauth-toolkit==1.1.3 @@ -117,7 +117,7 @@ edx-django-release-util==0.3.6 edx-django-sites-extensions==2.4.3 edx-django-utils==2.0.4 edx-drf-extensions==2.4.6 -edx-enterprise==2.3.4 +edx-enterprise==2.3.5 edx-i18n-tools==0.5.0 edx-lint==1.3.0 edx-milestones==0.2.6 @@ -131,7 +131,7 @@ edx-rest-api-client==3.0.2 edx-search==1.2.2 edx-sga==0.10.0 edx-sphinx-theme==1.5.0 -edx-submissions==3.0.3 +edx-submissions==3.0.4 edx-tincan-py35==0.0.5 edx-user-state-client==1.1.2 edx-when==0.7.0 @@ -304,7 +304,7 @@ staff-graded-xblock==0.6 stevedore==1.31.0 super-csv==0.9.6 sympy==1.5.1 -testfixtures==6.11.0 +testfixtures==6.12.0 text-unidecode==1.3 toml==0.10.0 tox-battery==0.5.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 242736a584..ad7d2d7e19 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -77,7 +77,7 @@ django-js-asset==1.2.2 django-method-override==0.2.0 django-model-utils==3.0.0 django-mptt==0.11.0 -django-multi-email-field==0.5.1 +django-multi-email-field==0.6.1 django-mysql==3.3.0 git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-object-actions==2.0.0 @@ -113,7 +113,7 @@ edx-django-release-util==0.3.6 edx-django-sites-extensions==2.4.3 edx-django-utils==2.0.4 edx-drf-extensions==2.4.6 -edx-enterprise==2.3.4 +edx-enterprise==2.3.5 edx-i18n-tools==0.5.0 edx-lint==1.3.0 edx-milestones==0.2.6 @@ -126,7 +126,7 @@ edx-rbac==1.0.5 edx-rest-api-client==3.0.2 edx-search==1.2.2 edx-sga==0.10.0 -edx-submissions==3.0.3 +edx-submissions==3.0.4 edx-tincan-py35==0.0.5 edx-user-state-client==1.1.2 edx-when==0.7.0 @@ -282,7 +282,7 @@ staff-graded-xblock==0.6 stevedore==1.31.0 super-csv==0.9.6 sympy==1.5.1 -testfixtures==6.11.0 +testfixtures==6.12.0 text-unidecode==1.3 toml==0.10.0 # via tox tox-battery==0.5.2