From 1ec04865530fcdea348f2e8cf7178cdfa6884349 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Fri, 19 Jul 2019 13:51:36 -0400 Subject: [PATCH] Pin pip-tools because of bugs --- requirements/constraints.txt | 5 ++++ requirements/edx/base.txt | 41 ++++++++++++++++---------------- requirements/edx/development.txt | 18 +++++++------- requirements/edx/paver.txt | 2 +- requirements/edx/pip-tools.in | 2 +- requirements/edx/testing.txt | 20 ++++++++-------- 6 files changed, 46 insertions(+), 42 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 6c438c9d50..b884cce929 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -14,6 +14,11 @@ futures ; python_version == "2.7" python-openid ; python_version == "2.7" pysqlite ; python_version == "2.7" +# pip-tools 3.9.0 has a few problems: +# https://github.com/jazzband/pip-tools/issues/851 +# https://github.com/jazzband/pip-tools/issues/852 +pip-tools==3.8.0 + # six is at 1.12.0, but transifex-client requires ==1.11.0 # https://github.com/transifex/transifex-client/issues/252 six==1.11.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 7e43a26320..968608891b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -20,10 +20,10 @@ -e openedx/core/lib/xblock_builtin/xblock_discussion -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive -e common/lib/xmodule -amqp==1.4.9 # via edx-enterprise, kombu +amqp==1.4.9 # via kombu analytics-python==1.2.9 -aniso8601==7.0.0 # via edx-enterprise, tincan -anyjson==0.3.3 # via edx-enterprise, kombu +aniso8601==7.0.0 # via tincan +anyjson==0.3.3 # via kombu appdirs==1.4.3 # via fs argh==0.26.2 asn1crypto==0.24.0 @@ -31,7 +31,7 @@ attrs==17.4.0 babel==1.3 backports.functools-lru-cache==1.5 # via soupsieve beautifulsoup4==4.7.1 # via pynliner -billiard==3.3.0.23 # via celery, edx-enterprise +billiard==3.3.0.23 # via celery bleach==2.1.4 boto3==1.4.8 boto==2.39.0 @@ -42,8 +42,8 @@ certifi==2019.6.16 cffi==1.12.3 chardet==3.0.4 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 -click==7.0 # via code-annotations, edx-enterprise, user-util -code-annotations==0.3.1 # via edx-enterprise +click==7.0 # via code-annotations, user-util +code-annotations==0.3.2 # via edx-enterprise coreapi==2.3.3 # via drf-yasg coreschema==0.0.4 # via coreapi, drf-yasg git+https://github.com/edx/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1 @@ -71,7 +71,7 @@ django-multi-email-field==0.5.1 # via edx-enterprise django-mysql==2.4.1 git+https://github.com/edx/django-oauth-plus.git@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1 django-oauth-toolkit==1.1.3 -django-object-actions==0.10.0 # via edx-enterprise +django-object-actions==1.1.0 # via edx-enterprise git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1 django-pipeline==1.6.14 django-pyfs==2.0 @@ -80,7 +80,7 @@ django-ratelimit==2.0.0 django-require==1.0.11 django-sekizai==1.0.0 django-ses==0.8.4 -django-simple-history==2.7.0 +django-simple-history==2.7.3 django-splash==0.2.2 django-statici18n==1.4.0 django-storages==1.4.1 @@ -90,7 +90,7 @@ django-webpack-loader==0.6.0 django==1.11.22 djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 -djangorestframework-xml==1.3.0 # via edx-enterprise +djangorestframework-xml==1.4.0 # via edx-enterprise djangorestframework==3.7.7 docopt==0.6.2 docutils==0.14 # via botocore @@ -105,11 +105,11 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 -edx-drf-extensions==2.3.1 -edx-enterprise==1.7.1 +edx-drf-extensions==2.3.5 +edx-enterprise==1.7.3 edx-i18n-tools==0.4.8 edx-milestones==0.2.3 -edx-oauth2-provider==1.2.2 +edx-oauth2-provider==1.2.3 edx-opaque-keys[django]==1.0.1 edx-organizations==2.1.0 edx-proctoring-proctortrack==1.0.5 @@ -142,11 +142,11 @@ inflection==0.3.1 # via drf-yasg ipaddress==1.0.22 isodate==0.6.0 # via python3-saml itypes==1.1.0 # via coreapi -jinja2==2.10.1 # via code-annotations, coreschema, edx-enterprise +jinja2==2.10.1 # via code-annotations, coreschema jmespath==0.9.4 # via boto3, botocore -jsondiff==1.1.1 # via edx-enterprise +jsondiff==1.2.0 # via edx-enterprise jsonfield==2.0.2 -kombu==3.0.37 # via celery, edx-enterprise +kombu==3.0.37 # via celery lazy==1.1 lepl==5.1.3 # via rfc6266-parser libsass==0.10.0 @@ -175,7 +175,7 @@ git+https://github.com/edx/edx-ora2.git@2.2.3#egg=ora2==2.2.3 path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 -pbr==5.4.0 +pbr==5.4.1 pdfminer.six==20181108 piexif==1.0.2 pillow==6.1.0 @@ -200,7 +200,7 @@ python-dateutil==2.4.0 python-levenshtein==0.12.0 python-memcached==1.59 python-openid==2.2.5 ; python_version == "2.7" # via social-auth-core -python-slugify==1.2.6 # via code-annotations, edx-enterprise +python-slugify==1.2.6 # via code-annotations python-swiftclient==3.8.0 python3-saml==1.5.0 pytz==2019.1 @@ -219,9 +219,9 @@ rules==2.0.1 s3transfer==0.1.13 # via boto3 sailthru-client==2.2.3 scipy==1.2.1 -semantic-version==2.6.0 # via edx-drf-extensions, edx-enterprise +semantic-version==2.6.0 # via edx-drf-extensions shapely==1.6.4.post2 -shortuuid==0.5.0 # via edx-django-oauth2-provider, edx-enterprise +shortuuid==0.5.0 # via edx-django-oauth2-provider simplejson==3.16.0 # via mailsnake, sailthru-client, zendesk singledispatch==3.4.0.3 six==1.11.0 @@ -239,14 +239,13 @@ sympy==1.4 testfixtures==6.10.0 # via edx-enterprise tincan==0.0.5 # via edx-enterprise unicodecsv==0.14.1 -unidecode==1.1.1 # via edx-enterprise uritemplate==3.0.0 # via coreapi, drf-yasg urllib3==1.23 user-util==0.1.5 voluptuous==0.11.5 watchdog==0.9.0 web-fragments==0.3.0 -webencodings==0.5.1 # via edx-enterprise, html5lib +webencodings==0.5.1 # via html5lib webob==1.8.5 # via xblock wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.1#egg=xblock-drag-and-drop-v2==2.2.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 204353287f..09941c56d4 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -53,7 +53,7 @@ chardet==3.0.4 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 click-log==0.3.2 click==7.0 -code-annotations==0.3.1 +code-annotations==0.3.2 colorama==0.4.1 configparser==3.7.4 contextlib2==0.5.5 @@ -90,7 +90,7 @@ django-multi-email-field==0.5.1 django-mysql==2.4.1 git+https://github.com/edx/django-oauth-plus.git@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1 django-oauth-toolkit==1.1.3 -django-object-actions==0.10.0 +django-object-actions==1.1.0 git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1 django-pipeline==1.6.14 django-pyfs==2.0 @@ -99,7 +99,7 @@ django-ratelimit==2.0.0 django-require==1.0.11 django-sekizai==1.0.0 django-ses==0.8.4 -django-simple-history==2.7.0 +django-simple-history==2.7.3 django-splash==0.2.2 django-statici18n==1.4.0 django-storages==1.4.1 @@ -109,7 +109,7 @@ django-webpack-loader==0.6.0 django==1.11.22 djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 -djangorestframework-xml==1.3.0 +djangorestframework-xml==1.4.0 djangorestframework==3.7.7 docopt==0.6.2 docutils==0.14 @@ -124,12 +124,12 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 -edx-drf-extensions==2.3.1 -edx-enterprise==1.7.1 +edx-drf-extensions==2.3.5 +edx-enterprise==1.7.3 edx-i18n-tools==0.4.8 edx-lint==1.3.0 edx-milestones==0.2.3 -edx-oauth2-provider==1.2.2 +edx-oauth2-provider==1.2.3 edx-opaque-keys[django]==1.0.1 edx-organizations==2.1.0 edx-proctoring-proctortrack==1.0.5 @@ -183,7 +183,7 @@ itypes==1.1.0 jinja2-pluralize==0.3.0 jinja2==2.10.1 jmespath==0.9.4 -jsondiff==1.1.1 +jsondiff==1.2.0 jsonfield==2.0.2 kombu==3.0.37 lazy-object-proxy==1.4.1 @@ -222,7 +222,7 @@ path.py==8.2.1 pathlib2==2.3.4 pathtools==0.1.2 paver==1.3.4 -pbr==5.4.0 +pbr==5.4.1 pdfminer.six==20181108 piexif==1.0.2 pillow==6.1.0 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 43bb2c81ce..d6eb40848b 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -16,7 +16,7 @@ mock==1.0.1 path.py==8.2.1 pathtools==0.1.2 # via watchdog paver==1.3.4 -pbr==5.4.0 # via stevedore +pbr==5.4.1 # via stevedore psutil==1.2.1 pymongo==2.9.1 python-memcached==1.59 diff --git a/requirements/edx/pip-tools.in b/requirements/edx/pip-tools.in index 098843a697..b7127e0811 100644 --- a/requirements/edx/pip-tools.in +++ b/requirements/edx/pip-tools.in @@ -10,4 +10,4 @@ -c ../constraints.txt pip-tools # Contains pip-compile, used to generate pip requirements files -six==1.11.0 # Pinned because pip-tools needs it, but later transifex-client says ==1.11.0 +six # Python 2/3 compatibility diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5625737627..a3c7bc101f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -51,7 +51,7 @@ chardet==3.0.4 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 click-log==0.3.2 # via edx-lint click==7.0 -code-annotations==0.3.1 +code-annotations==0.3.2 colorama==0.4.1 # via radon configparser==3.7.4 # via entrypoints, flake8, importlib-metadata, pylint contextlib2==0.5.5 # via importlib-metadata @@ -87,7 +87,7 @@ django-multi-email-field==0.5.1 django-mysql==2.4.1 git+https://github.com/edx/django-oauth-plus.git@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1 django-oauth-toolkit==1.1.3 -django-object-actions==0.10.0 +django-object-actions==1.1.0 git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1 django-pipeline==1.6.14 django-pyfs==2.0 @@ -96,7 +96,7 @@ django-ratelimit==2.0.0 django-require==1.0.11 django-sekizai==1.0.0 django-ses==0.8.4 -django-simple-history==2.7.0 +django-simple-history==2.7.3 django-splash==0.2.2 django-statici18n==1.4.0 django-storages==1.4.1 @@ -105,7 +105,7 @@ django-waffle==0.12.0 django-webpack-loader==0.6.0 djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 -djangorestframework-xml==1.3.0 +djangorestframework-xml==1.4.0 djangorestframework==3.7.7 docopt==0.6.2 docutils==0.14 @@ -120,12 +120,12 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 -edx-drf-extensions==2.3.1 -edx-enterprise==1.7.1 +edx-drf-extensions==2.3.5 +edx-enterprise==1.7.3 edx-i18n-tools==0.4.8 edx-lint==1.3.0 edx-milestones==0.2.3 -edx-oauth2-provider==1.2.2 +edx-oauth2-provider==1.2.3 edx-opaque-keys[django]==1.0.1 edx-organizations==2.1.0 edx-proctoring-proctortrack==1.0.5 @@ -177,7 +177,7 @@ itypes==1.1.0 jinja2-pluralize==0.3.0 jinja2==2.10.1 jmespath==0.9.4 -jsondiff==1.1.1 +jsondiff==1.2.0 jsonfield==2.0.2 kombu==3.0.37 lazy-object-proxy==1.4.1 # via astroid @@ -215,7 +215,7 @@ path.py==8.2.1 pathlib2==2.3.4 # via importlib-metadata, pytest, pytest-django pathtools==0.1.2 paver==1.3.4 -pbr==5.4.0 +pbr==5.4.1 pdfminer.six==20181108 piexif==1.0.2 pillow==6.1.0 @@ -305,7 +305,7 @@ tox==3.13.2 transifex-client==0.13.6 typing==3.7.4 # via flake8 unicodecsv==0.14.1 -unidecode==1.1.1 +unidecode==1.1.1 # via python-slugify uritemplate==3.0.0 urllib3==1.23 user-util==0.1.5