From 8d4a2e2be9f72f3f8ea6e16279de56965f424aca Mon Sep 17 00:00:00 2001 From: Jeremy Bowman <jbowman@edx.org> Date: Fri, 18 May 2018 15:14:29 -0400 Subject: [PATCH] Upgrades to avoid sure install bug --- requirements/edx-sandbox/base.txt | 3 ++- requirements/edx-sandbox/shared.in | 2 +- requirements/edx-sandbox/shared.txt | 3 ++- requirements/edx/base.txt | 5 +++-- requirements/edx/coverage.txt | 1 + requirements/edx/development.txt | 11 ++++++----- requirements/edx/paver.txt | 1 + requirements/edx/pip-tools.txt | 1 + requirements/edx/testing.txt | 11 ++++++----- 9 files changed, 23 insertions(+), 15 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 0f1c4871a9e..6ec232c40fb 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -4,6 +4,7 @@ # # make upgrade # + common/lib/calc common/lib/chem common/lib/sandbox-packages @@ -11,7 +12,7 @@ common/lib/symmath asn1crypto==0.24.0 backports-abc==0.5 # via tornado cffi==1.11.5 -cryptography==2.1.4 +cryptography==2.2.2 enum34==1.1.6 futures==3.2.0 # via tornado idna==2.6 diff --git a/requirements/edx-sandbox/shared.in b/requirements/edx-sandbox/shared.in index 401c57505df..f073be0d3f7 100644 --- a/requirements/edx-sandbox/shared.in +++ b/requirements/edx-sandbox/shared.in @@ -7,7 +7,7 @@ # * confirm that it has no system requirements beyond what we already install # * run "make upgrade" to update the detailed requirements files -cryptography==2.1.4 # Implementations of assorted cryptography algorithms +cryptography # Implementations of assorted cryptography algorithms lxml==3.8.0 # XML parser networkx==1.7 # Utilities for creating, manipulating, and studying network graphs nltk # Natural language processing; used by the chem package diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 14187946835..e9f57b37502 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -4,13 +4,14 @@ # # make upgrade # + -e common/lib/calc -e common/lib/chem -e common/lib/sandbox-packages -e common/lib/symmath asn1crypto==0.24.0 # via cryptography cffi==1.11.5 # via cryptography -cryptography==2.1.4 +cryptography==2.2.2 enum34==1.1.6 # via cryptography idna==2.6 # via cryptography ipaddress==1.0.22 # via cryptography diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4229a8fc899..b7f03cde807 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -4,6 +4,7 @@ # # make upgrade # + -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e common/lib/calc -e common/lib/capa @@ -62,7 +63,7 @@ charade==1.0.3 # via pysrt click==6.7 # via user-util coreapi==2.3.3 # via django-rest-swagger, openapi-codec coreschema==0.0.4 # via coreapi -cryptography==2.1.4 +cryptography==2.2.2 cssutils==1.0.2 # via pynliner ddt==0.8.0 decorator==4.3.0 # via dogapi, pycontracts @@ -168,7 +169,7 @@ mock==1.0.1 mongoengine==0.10.0 mysql-python==1.2.5 networkx==1.7 -newrelic==3.2.0.91 +newrelic==3.2.1.93 nltk==3.3.0 nodeenv==1.1.1 numpy==1.6.2 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 2ee11724863..c721171b435 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -4,6 +4,7 @@ # # make upgrade # + coverage==4.2 diff-cover==0.9.8 inflect==0.3.1 # via jinja2-pluralize diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f30190a75cf..3c8dff13599 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -4,6 +4,7 @@ # # make upgrade # + -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e common/lib/calc -e common/lib/capa @@ -77,7 +78,7 @@ constantly==15.1.0 coreapi==2.3.3 coreschema==0.0.4 coverage==4.2 -cryptography==2.1.4 +cryptography==2.2.2 cssselect==1.0.3 cssutils==1.0.2 ddt==0.8.0 @@ -215,7 +216,7 @@ moto==0.3.1 mysql-python==1.2.5 needle==0.5.0 networkx==1.7 -newrelic==3.2.0.91 +newrelic==3.2.1.93 nltk==3.3.0 nodeenv==1.1.1 nose==1.3.7 @@ -259,7 +260,7 @@ pylint-plugin-utils==0.2.6 pylint==1.7.1 pymongo==2.9.1 pynliner==0.5.2 -pyopenssl==17.5.0 +pyopenssl==18.0.0 pyparsing==2.2.0 pyquery==1.4.0 pysqlite==2.8.3 @@ -313,7 +314,7 @@ sphinxcontrib-websupport==1.0.1 # via sphinx splinter==0.8.0 sqlparse==0.2.4 # via django-debug-toolbar stevedore==1.10.0 -sure==1.4.10 +sure==1.4.11 sympy==0.7.1 testfixtures==6.0.2 testtools==2.3.0 @@ -331,7 +332,7 @@ uritemplate==3.0.0 urllib3==1.22 urlobject==2.4.3 user-util==0.1.3 -virtualenv==15.2.0 +virtualenv==16.0.0 voluptuous==0.11.1 w3lib==1.19.0 watchdog==0.8.3 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index f00bbe947b7..fe881ec7897 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,6 +4,7 @@ # # make upgrade # + argh==0.26.2 # via watchdog argparse==1.4.0 # via stevedore edx-opaque-keys==0.4.4 diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index e7027f3fb21..44aa65b2a3d 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -4,6 +4,7 @@ # # make upgrade # + click==6.7 # via pip-tools first==2.0.1 # via pip-tools pip-tools==2.0.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 829e5e50de9..e5adb74a905 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -4,6 +4,7 @@ # # make upgrade # + -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e common/lib/calc -e common/lib/capa @@ -74,7 +75,7 @@ constantly==15.1.0 # via twisted coreapi==2.3.3 coreschema==0.0.4 coverage==4.2 -cryptography==2.1.4 +cryptography==2.2.2 cssselect==1.0.3 cssutils==1.0.2 ddt==0.8.0 @@ -207,7 +208,7 @@ moto==0.3.1 mysql-python==1.2.5 needle==0.5.0 # via bok-choy networkx==1.7 -newrelic==3.2.0.91 +newrelic==3.2.1.93 nltk==3.3.0 nodeenv==1.1.1 nose==1.3.7 @@ -248,7 +249,7 @@ pylint-plugin-utils==0.2.6 # via pylint-celery, pylint-django pylint==1.7.1 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils pymongo==2.9.1 pynliner==0.5.2 -pyopenssl==17.5.0 # via scrapy, service-identity +pyopenssl==18.0.0 # via scrapy, service-identity pyparsing==2.2.0 pyquery==1.4.0 pysqlite==2.8.3 @@ -297,7 +298,7 @@ sorl-thumbnail==12.3 sortedcontainers==0.9.2 splinter==0.8.0 stevedore==1.10.0 -sure==1.4.10 +sure==1.4.11 sympy==0.7.1 testfixtures==6.0.2 testtools==2.3.0 # via fixtures, python-subunit @@ -314,7 +315,7 @@ uritemplate==3.0.0 urllib3==1.22 urlobject==2.4.3 # via pa11ycrawler user-util==0.1.3 -virtualenv==15.2.0 # via tox +virtualenv==16.0.0 # via tox voluptuous==0.11.1 w3lib==1.19.0 # via parsel, scrapy watchdog==0.8.3 -- GitLab