Merge pull request #19388 from edx/nedbat/pin-idna

Pin idna<2.8 to resolve 'make upgrade' conflict

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.

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

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

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

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