From 7945e59f769b9ac14e8a1f1a6174366eafa68a32 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Fri, 7 Dec 2018 11:23:40 -0500 Subject: [PATCH 1/2] Pin idna to prevent conflicts --- requirements/edx-sandbox/shared.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/requirements/edx-sandbox/shared.in b/requirements/edx-sandbox/shared.in index f073be0d3f..c5057c8914 100644 --- a/requirements/edx-sandbox/shared.in +++ b/requirements/edx-sandbox/shared.in @@ -16,6 +16,13 @@ pyparsing # Python parsing library; used by the calc p sympy==0.7.1 # Symbolic math library; used by the calc package scipy==0.14.0 # Math, science, and engineering library; used by the calc package +# Pinned early: +# edx-sandbox/shared.in has cryptography, which wants idna, and finds 2.8 +# paver.in has requests, which wants idna<2.8 +# but paver.in includes edx-sandbox/shared.txt which now pins idna==2.8 +# *conflict* +idna<2.8 + # Install these packages from the edx-platform working tree # NOTE: if you change code in these packages, you MUST change the version # number in its setup.py or the code WILL NOT be installed during deploy. From f5c5d6f415694851ee72ecdca237a38a4a25d472 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Fri, 7 Dec 2018 11:49:58 -0500 Subject: [PATCH 2/2] make upgrade --- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 45b0807f46..59ccac511d 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -12,7 +12,7 @@ asn1crypto==0.24.0 # via cryptography cffi==1.11.5 # via cryptography cryptography==2.4.2 enum34==1.1.6 # via cryptography -idna==2.7 # via cryptography +idna==2.7 ipaddress==1.0.22 # via cryptography lxml==3.8.0 markupsafe==1.1.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 20656c1226..0bb76d1cda 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -118,7 +118,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.1 edx-drf-extensions==2.0.1 -edx-enterprise==1.0.6 +edx-enterprise==1.1.0 edx-i18n-tools==0.4.6 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 @@ -213,7 +213,7 @@ requests-oauthlib==1.0.0 requests==2.20.1 rest-condition==1.0.3 rfc6266-parser==0.0.5.post2 -rules==2.0 +rules==2.0.1 s3transfer==0.1.13 # via boto3 sailthru-client==2.2.3 scipy==0.14.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 47296b4b94..4f19b585bb 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -137,7 +137,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.1 edx-drf-extensions==2.0.1 -edx-enterprise==1.0.6 +edx-enterprise==1.1.0 edx-i18n-tools==0.4.6 edx-lint==0.6.0 edx-milestones==0.1.13 @@ -147,7 +147,7 @@ edx-organizations==1.0.0 edx-proctoring==1.4.0 edx-rest-api-client==1.9.2 edx-search==1.2.1 -edx-sphinx-theme==1.3.0 +edx-sphinx-theme==1.4.0 edx-submissions==2.0.12 edx-user-state-client==1.0.4 edxval==0.1.22 @@ -292,14 +292,14 @@ requests-oauthlib==1.0.0 requests==2.20.1 rest-condition==1.0.3 rfc6266-parser==0.0.5.post2 -rules==2.0 +rules==2.0.1 s3transfer==0.1.13 sailthru-client==2.2.3 scipy==0.14.0 scrapy==1.1.2 selenium==3.141.0 semantic-version==2.6.0 -service-identity==17.0.0 +service-identity==18.1.0 shapely==1.2.16 shortuuid==0.5.0 simplejson==3.16.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ae6e1b111d..1c53767617 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -132,7 +132,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.1 edx-drf-extensions==2.0.1 -edx-enterprise==1.0.6 +edx-enterprise==1.1.0 edx-i18n-tools==0.4.6 edx-lint==0.6.0 edx-milestones==0.1.13 @@ -249,7 +249,7 @@ pylint-plugin-utils==0.3 pylint==1.7.6 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils pymongo==2.9.1 pynliner==0.8.0 -pyopenssl==18.0.0 # via scrapy, service-identity +pyopenssl==18.0.0 # via scrapy pyparsing==2.2.0 pyquery==1.4.0 pysqlite==2.8.3 @@ -281,14 +281,14 @@ requests-oauthlib==1.0.0 requests==2.20.1 rest-condition==1.0.3 rfc6266-parser==0.0.5.post2 -rules==2.0 +rules==2.0.1 s3transfer==0.1.13 sailthru-client==2.2.3 scipy==0.14.0 scrapy==1.1.2 # via pa11ycrawler selenium==3.141.0 semantic-version==2.6.0 -service-identity==17.0.0 # via scrapy +service-identity==18.1.0 # via scrapy shapely==1.2.16 shortuuid==0.5.0 simplejson==3.16.0