From 5b429952270511c27e3e14343d6eb5cb5a769550 Mon Sep 17 00:00:00 2001 From: Jeff Chaves <58956521+chavesj@users.noreply.github.com> Date: Fri, 15 May 2020 18:32:33 -0400 Subject: [PATCH] make upgrade to bump edx-enterprise version (#24013) --- requirements/constraints.txt | 3 +++ requirements/edx-sandbox/py35.txt | 2 +- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c690a85c7a..27417d6847 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -50,6 +50,9 @@ httpretty<1.0 # 4.0.0 dropped support for Python 3.5 inflect<4.0.0 +# 0.15.0 dropped support for Python 3.5 +joblib<0.15.0 + # jsonfield2 3.1.0 drops support for python 3.5 jsonfield2<3.1.0 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 1816cd4185..923b1520b3 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -13,7 +13,7 @@ click==7.1.2 # via -r requirements/edx-sandbox/shared.txt, nltk cryptography==2.9.2 # via -r requirements/edx-sandbox/shared.txt cycler==0.10.0 # via matplotlib decorator==4.4.2 # via networkx -joblib==0.14.1 # via -r requirements/edx-sandbox/shared.txt, nltk +joblib==0.14.1 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.txt, nltk kiwisolver==1.1.0 # via -c requirements/edx-sandbox/../constraints.txt, matplotlib lxml==4.5.0 # via -r requirements/edx-sandbox/shared.txt markupsafe==1.1.1 # via chem diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index e95e40f343..cfbffc4664 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -7,7 +7,7 @@ cffi==1.14.0 # via cryptography click==7.1.2 # via nltk cryptography==2.9.2 # via -r requirements/edx-sandbox/shared.in -joblib==0.14.1 # via nltk +joblib==0.14.1 # via -c requirements/edx-sandbox/../constraints.txt, nltk lxml==4.5.0 # via -r requirements/edx-sandbox/shared.in nltk==3.5 # via -r requirements/edx-sandbox/shared.in pycparser==2.20 # via cffi diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index faf93d240a..a56d86a9ba 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -103,7 +103,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # 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.12 # via -r requirements/edx/base.in +edx-enterprise==3.2.13 # via -r requirements/edx/base.in edx-i18n-tools==0.5.3 # 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 @@ -140,7 +140,7 @@ isodate==0.6.0 # via python3-saml itypes==1.2.0 # via coreapi jinja2==2.11.2 # via code-annotations, coreschema jmespath==0.10.0 # via boto3, botocore -joblib==0.14.1 # via -r requirements/edx/../edx-sandbox/shared.txt, nltk +joblib==0.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/../edx-sandbox/shared.txt, nltk jsondiff==1.2.0 # via edx-enterprise jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions, ora2 kombu==3.0.37 # via celery diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 843c948268..07ab077147 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -115,7 +115,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # 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.12 # via -r requirements/edx/testing.txt +edx-enterprise==3.2.13 # via -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # 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 @@ -167,7 +167,7 @@ itypes==1.2.0 # via -r requirements/edx/testing.txt, coreapi jinja2-pluralize==0.3.0 # via -r requirements/edx/testing.txt, diff-cover jinja2==2.11.2 # via -r requirements/edx/testing.txt, code-annotations, coreschema, diff-cover, jinja2-pluralize, sphinx jmespath==0.10.0 # via -r requirements/edx/testing.txt, boto3, botocore -joblib==0.14.1 # via -r requirements/edx/testing.txt, nltk +joblib==0.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, nltk jsondiff==1.2.0 # via -r requirements/edx/testing.txt, edx-enterprise jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions, ora2 jsonschema==3.2.0 # via sphinxcontrib-openapi diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 789358558d..5aecf48bdf 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -111,7 +111,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt edx-django-utils==3.2.2 # via -r requirements/edx/base.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/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.12 # via -r requirements/edx/base.txt +edx-enterprise==3.2.13 # via -r requirements/edx/base.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt @@ -161,7 +161,7 @@ itypes==1.2.0 # via -r requirements/edx/base.txt, coreapi jinja2-pluralize==0.3.0 # via -r requirements/edx/coverage.txt, diff-cover jinja2==2.11.2 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, code-annotations, coreschema, diff-cover, jinja2-pluralize jmespath==0.10.0 # via -r requirements/edx/base.txt, boto3, botocore -joblib==0.14.1 # via -r requirements/edx/base.txt, nltk +joblib==0.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, nltk jsondiff==1.2.0 # via -r requirements/edx/base.txt, edx-enterprise jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions, ora2 kombu==3.0.37 # via -r requirements/edx/base.txt, celery