From b7fe87070528f7ab69213321b3eb757d290900ec Mon Sep 17 00:00:00 2001 From: Christopher Pappas <cpappas@edx.org> Date: Wed, 16 Jan 2019 17:47:17 -0500 Subject: [PATCH] Running make upgrade to bump edx-entprise from 1.2.3 to 1.2.5. Also, updating constraints.txt to prevent a backwards incompatible update from oauthlib --- requirements/constraints.txt | 6 ++++++ requirements/edx/base.txt | 12 ++++++------ requirements/edx/development.txt | 26 +++++++++++++------------- requirements/edx/testing.txt | 26 +++++++++++++------------- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 5685efa0c33..5009b41a383 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -24,3 +24,9 @@ splinter==0.9.0 # transifex-client 0.13.5 requires urllib3<1.24, but requests will pull in urllib3==1.24 (https://github.com/transifex/transifex-client/pull/241/files) urllib3<1.24 + +# Bumping requests-oauthlib to 1.2 updates oauthlib to 3.0.0, which changes a response code in certain cases +# This causes a test to fail. Before fixing, we would need to make sure mobile apps are functional with this change +# See https://github.com/oauthlib/oauthlib/issues/264 for more context +requests-oauthlib==1.1.0 +oauthlib==2.1.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 5cc3dca613a..83f7600b1a1 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -93,7 +93,7 @@ django-require==1.0.11 django-rest-swagger==2.2.0 django-sekizai==0.10.0 django-ses==0.8.4 -django-simple-history==2.6.0 +django-simple-history==2.7.0 django-splash==0.2.2 django-statici18n==1.4.0 django-storages==1.4.1 @@ -117,14 +117,14 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.3 edx-drf-extensions==2.0.1 -edx-enterprise==1.2.3 +edx-enterprise==1.2.5 edx-i18n-tools==0.4.6 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 edx-proctoring-proctortrack==1.0.0 -edx-proctoring==1.5.5 +edx-proctoring==1.5.6 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.0.12 @@ -169,7 +169,7 @@ mock==1.0.1 mongoengine==0.10.0 mysql-python==1.2.5 networkx==1.7 -newrelic==4.8.0.110 +newrelic==4.10.0.112 nltk==3.4 nodeenv==1.1.1 numpy==1.6.2 @@ -208,7 +208,7 @@ pytz==2018.9 pyuca==1.1 pyyaml==3.13 redis==2.10.6 -reportlab==3.5.12 +reportlab==3.5.13 requests-oauthlib==1.1.0 requests==2.21.0 rest-condition==1.0.3 @@ -228,7 +228,7 @@ social-auth-app-django==2.1.0 social-auth-core==1.7.0 sorl-thumbnail==12.3 sortedcontainers==0.9.2 -soupsieve==1.6.2 # via beautifulsoup4 +soupsieve==1.7.1 # via beautifulsoup4 sqlparse==0.2.4 stevedore==1.10.0 sympy==0.7.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5b615d3c321..569f291ee6c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -111,7 +111,7 @@ django-require==1.0.11 django-rest-swagger==2.2.0 django-sekizai==0.10.0 django-ses==0.8.4 -django-simple-history==2.6.0 +django-simple-history==2.7.0 django-splash==0.2.2 django-statici18n==1.4.0 django-storages==1.4.1 @@ -135,7 +135,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.3 edx-drf-extensions==2.0.1 -edx-enterprise==1.2.3 +edx-enterprise==1.2.5 edx-i18n-tools==0.4.6 edx-lint==1.0.0 edx-milestones==0.1.13 @@ -143,7 +143,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 edx-proctoring-proctortrack==1.0.0 -edx-proctoring==1.5.5 +edx-proctoring==1.5.6 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-sphinx-theme==1.4.0 @@ -216,7 +216,7 @@ more-itertools==5.0.0 moto==0.3.1 mysql-python==1.2.5 networkx==1.7 -newrelic==4.8.0.110 +newrelic==4.10.0.112 nltk==3.4 nodeenv==1.1.1 numpy==1.6.2 @@ -235,7 +235,7 @@ pdfminer==20140328 piexif==1.0.2 pillow==5.4.1 pip-tools==3.2.0 -pluggy==0.8.0 +pluggy==0.8.1 polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 @@ -268,10 +268,10 @@ pysrt==1.1.1 pytest-attrib==0.1.3 pytest-cov==2.6.1 pytest-django==3.4.5 -pytest-forked==0.2 +pytest-forked==1.0.1 pytest-randomly==1.2.3 -pytest-xdist==1.25.0 -pytest==4.1.0 +pytest-xdist==1.26.0 +pytest==4.1.1 python-dateutil==2.4.0 python-levenshtein==0.12.0 python-memcached==1.48 @@ -287,7 +287,7 @@ pyyaml==3.13 queuelib==1.5.0 radon==2.4.0 redis==2.10.6 -reportlab==3.5.12 +reportlab==3.5.13 requests-oauthlib==1.1.0 requests==2.21.0 rest-condition==1.0.3 @@ -313,7 +313,7 @@ social-auth-app-django==2.1.0 social-auth-core==1.7.0 sorl-thumbnail==12.3 sortedcontainers==0.9.2 -soupsieve==1.6.2 +soupsieve==1.7.1 sphinx==1.8.3 sphinxcontrib-websupport==1.1.0 # via sphinx splinter==0.9.0 @@ -321,13 +321,13 @@ sqlparse==0.2.4 stevedore==1.10.0 sure==1.4.11 sympy==0.7.1 -testfixtures==6.4.1 +testfixtures==6.4.3 testtools==2.3.0 text-unidecode==1.2 tincan==0.0.5 toml==0.10.0 tox-battery==0.5.1 -tox==3.6.1 +tox==3.7.0 traceback2==1.4.0 transifex-client==0.13.5 twisted==16.6.0 @@ -342,7 +342,7 @@ user-util==0.1.5 virtualenv==16.2.0 voluptuous==0.11.5 vulture==1.0 -w3lib==1.19.0 +w3lib==1.20.0 watchdog==0.9.0 web-fragments==0.2.2 webencodings==0.5.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9a133d263bb..dba40d147db 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -107,7 +107,7 @@ django-require==1.0.11 django-rest-swagger==2.2.0 django-sekizai==0.10.0 django-ses==0.8.4 -django-simple-history==2.6.0 +django-simple-history==2.7.0 django-splash==0.2.2 django-statici18n==1.4.0 django-storages==1.4.1 @@ -130,7 +130,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.3 edx-drf-extensions==2.0.1 -edx-enterprise==1.2.3 +edx-enterprise==1.2.5 edx-i18n-tools==0.4.6 edx-lint==1.0.0 edx-milestones==0.1.13 @@ -138,7 +138,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 edx-proctoring-proctortrack==1.0.0 -edx-proctoring==1.5.5 +edx-proctoring==1.5.6 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.0.12 @@ -208,7 +208,7 @@ more-itertools==5.0.0 # via pytest moto==0.3.1 mysql-python==1.2.5 networkx==1.7 -newrelic==4.8.0.110 +newrelic==4.10.0.112 nltk==3.4 nodeenv==1.1.1 numpy==1.6.2 @@ -225,7 +225,7 @@ pbr==5.1.1 pdfminer==20140328 piexif==1.0.2 pillow==5.4.1 -pluggy==0.8.0 # via pytest, tox +pluggy==0.8.1 # via pytest, tox polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 @@ -257,10 +257,10 @@ pysrt==1.1.1 pytest-attrib==0.1.3 pytest-cov==2.6.1 pytest-django==3.4.5 -pytest-forked==0.2 # via pytest-xdist +pytest-forked==1.0.1 # via pytest-xdist pytest-randomly==1.2.3 -pytest-xdist==1.25.0 -pytest==4.1.0 +pytest-xdist==1.26.0 +pytest==4.1.1 python-dateutil==2.4.0 python-levenshtein==0.12.0 python-memcached==1.48 @@ -276,7 +276,7 @@ pyyaml==3.13 queuelib==1.5.0 # via scrapy radon==2.4.0 redis==2.10.6 -reportlab==3.5.12 +reportlab==3.5.13 requests-oauthlib==1.1.0 requests==2.21.0 rest-condition==1.0.3 @@ -300,19 +300,19 @@ social-auth-app-django==2.1.0 social-auth-core==1.7.0 sorl-thumbnail==12.3 sortedcontainers==0.9.2 -soupsieve==1.6.2 +soupsieve==1.7.1 splinter==0.9.0 sqlparse==0.2.4 stevedore==1.10.0 sure==1.4.11 sympy==0.7.1 -testfixtures==6.4.1 +testfixtures==6.4.3 testtools==2.3.0 # via fixtures, python-subunit text-unidecode==1.2 # via faker tincan==0.0.5 toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.6.1 +tox==3.7.0 traceback2==1.4.0 # via testtools, unittest2 transifex-client==0.13.5 twisted==16.6.0 # via pa11ycrawler, scrapy @@ -325,7 +325,7 @@ urlobject==2.4.3 # via pa11ycrawler user-util==0.1.5 virtualenv==16.2.0 # via tox voluptuous==0.11.5 -w3lib==1.19.0 # via parsel, scrapy +w3lib==1.20.0 # via parsel, scrapy watchdog==0.9.0 web-fragments==0.2.2 webencodings==0.5.1 -- GitLab