From 7058a0a3b568ec0aec453113c4dc3fb2414b8744 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Wed, 15 May 2019 13:17:16 -0400 Subject: [PATCH] Python Requirements Update (#573) * Updating Python Requirements * Use better pip-compile arguments --- Makefile | 11 ++++++----- requirements/base.txt | 6 +++--- requirements/dev.txt | 31 ++++++++++++++++++------------- requirements/doc.txt | 8 ++++---- requirements/quality.txt | 8 ++++---- requirements/test.txt | 7 ++++--- 6 files changed, 39 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 8405b490542..29e6dd73c07 100644 --- a/Makefile +++ b/Makefile @@ -25,13 +25,14 @@ clean: ## remove generated byte code, coverage reports, and build artifacts find . -name '*.pyc' -o -name '*.pyo' -o -name '*~' -delete rm -fr build/ dist/ *.egg-info +upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -q pip-tools - pip-compile --upgrade -o requirements/base.txt requirements/base.in - pip-compile --upgrade -o requirements/dev.txt requirements/dev.in - pip-compile --upgrade -o requirements/doc.txt requirements/doc.in - pip-compile --upgrade -o requirements/quality.txt requirements/quality.in - pip-compile --upgrade -o requirements/test.txt requirements/test.in + pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in + pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in + pip-compile --rebuild --upgrade -o requirements/doc.txt requirements/doc.in + pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in + pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in # Let tox control the Django and djangorestframework versions for tests sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt sed -i.tmp '/^djangorestframework==/d' requirements/test.txt diff --git a/requirements/base.txt b/requirements/base.txt index b6caded6943..bee6b68d3a8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --upgrade -o requirements/base.txt requirements/base.in +# make upgrade # appdirs==1.4.3 # via fs backports.os==0.1.1 # via fs @@ -15,9 +15,9 @@ django-waffle==0.16.0 django-webpack-loader==0.6.0 django==1.11.20 djangorestframework-jwt==1.11.0 # via edx-drf-extensions -djangorestframework==3.9.3 +djangorestframework==3.9.4 edx-django-utils==1.0.3 # via edx-drf-extensions -edx-drf-extensions==2.2.0 +edx-drf-extensions==2.2.1 edx-opaque-keys==0.4.4 edx-rest-api-client==1.9.2 edx-when==0.1.4 diff --git a/requirements/dev.txt b/requirements/dev.txt index 3e55c33f4c0..0bf1a4b08e0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --upgrade -o requirements/dev.txt requirements/dev.in +# make upgrade # argparse==1.4.0 # via caniusepython3 astroid==1.5.2 # via edx-lint, pylint, pylint-celery @@ -13,9 +13,10 @@ certifi==2019.3.9 # via requests chardet==3.0.4 # via requests click-log==0.1.8 # via edx-lint click==7.0 # via click-log, edx-lint, pip-tools -configparser==3.7.4 # via pydocstyle, pylint -diff-cover==2.0.0 -distlib==0.2.8 # via caniusepython3 +configparser==3.7.4 # via importlib-metadata, pydocstyle, pylint +contextlib2==0.5.5 # via importlib-metadata +diff-cover==2.0.1 +distlib==0.2.9.post0 # via caniusepython3 django==1.11.20 docutils==0.14 # via readme-renderer edx-i18n-tools==0.4.8 @@ -24,23 +25,25 @@ enum34==1.1.6 # via astroid filelock==3.0.10 # via tox futures==3.2.0 ; python_version == "2.7" # via caniusepython3, isort idna==2.8 # via requests +importlib-metadata==0.12 # via path.py inflect==2.1.0 # via jinja2-pluralize -isort==4.3.18 +isort==4.3.20 jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.10.1 # via diff-cover, jinja2-pluralize -lazy-object-proxy==1.4.0 # via astroid +lazy-object-proxy==1.4.1 # via astroid markupsafe==1.1.1 # via jinja2 mccabe==0.6.1 # via pylint packaging==19.0 # via caniusepython3 path.py==11.5.2 -pip-tools==3.6.1 +pathlib2==2.3.3 # via importlib-metadata +pip-tools==3.7.0 pkginfo==1.5.0.1 # via twine pluggy==0.11.0 # via tox polib==1.1.0 # via edx-i18n-tools py==1.8.0 # via tox pycodestyle==2.5.0 pydocstyle==3.0.0 -pygments==2.3.1 # via diff-cover, readme-renderer +pygments==2.4.0 # via diff-cover, readme-renderer pylint-celery==0.3 # via edx-lint pylint-django==0.7.2 # via edx-lint pylint-plugin-utils==0.5 # via pylint-celery, pylint-django @@ -51,16 +54,18 @@ pyyaml==5.1 # via edx-i18n-tools readme-renderer==24.0 # via twine requests-toolbelt==0.9.1 # via twine requests==2.21.0 # via caniusepython3, requests-toolbelt, twine +scandir==1.10.0 # via pathlib2 singledispatch==3.4.0.3 # via astroid, pylint -six==1.12.0 # via astroid, bleach, diff-cover, edx-i18n-tools, edx-lint, packaging, pip-tools, pydocstyle, pylint, readme-renderer, singledispatch, tox +six==1.12.0 # via astroid, bleach, diff-cover, edx-i18n-tools, edx-lint, packaging, pathlib2, pip-tools, pydocstyle, pylint, readme-renderer, singledispatch, tox snowballstemmer==1.2.1 # via pydocstyle toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.9.0 -tqdm==4.31.1 # via twine +tox==3.10.0 +tqdm==4.32.1 # via twine twine==1.13.0 urllib3==1.24.3 # via requests -virtualenv==16.5.0 # via tox +virtualenv==16.6.0 # via tox webencodings==0.5.1 # via bleach -wheel==0.33.1 +wheel==0.33.4 wrapt==1.11.1 # via astroid +zipp==0.5.0 # via importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 789cf543021..60e94a5183b 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --upgrade -o requirements/doc.txt requirements/doc.in +# make upgrade # alabaster==0.7.12 # via sphinx appdirs==1.4.3 # via fs @@ -18,11 +18,11 @@ django-waffle==0.16.0 django-webpack-loader==0.6.0 django==1.11.20 djangorestframework-jwt==1.11.0 # via edx-drf-extensions -djangorestframework==3.9.3 +djangorestframework==3.9.4 doc8==0.8.0 docutils==0.14 # via doc8, readme-renderer, restructuredtext-lint, sphinx edx-django-utils==1.0.3 # via edx-drf-extensions -edx-drf-extensions==2.2.0 +edx-drf-extensions==2.2.1 edx-opaque-keys==0.4.4 edx-rest-api-client==1.9.2 edx-sphinx-theme==1.4.0 @@ -43,7 +43,7 @@ pbr==5.2.0 # via stevedore pockets==0.7.2 # via sphinxcontrib-napoleon psutil==1.2.1 # via edx-django-utils, edx-drf-extensions pycryptodomex==3.8.1 -pygments==2.3.1 # via readme-renderer, sphinx +pygments==2.4.0 # via readme-renderer, sphinx pyjwkest==1.3.2 # via edx-drf-extensions pyjwt==1.7.1 # via djangorestframework-jwt, edx-rest-api-client pymongo==3.8.0 # via edx-opaque-keys, event-tracking diff --git a/requirements/quality.txt b/requirements/quality.txt index 2f9e6700ab6..c842ee2ddc6 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --upgrade -o requirements/quality.txt requirements/quality.in +# make upgrade # argparse==1.4.0 # via caniusepython3 astroid==1.5.2 # via edx-lint, pylint, pylint-celery @@ -13,14 +13,14 @@ chardet==3.0.4 # via requests click-log==0.1.8 # via edx-lint click==7.0 # via click-log, edx-lint configparser==3.7.4 # via pydocstyle, pylint -distlib==0.2.8 # via caniusepython3 +distlib==0.2.9.post0 # via caniusepython3 django==1.11.20 edx_lint==0.5.5 enum34==1.1.6 # via astroid futures==3.2.0 ; python_version == "2.7" # via caniusepython3, isort idna==2.8 # via requests -isort==4.3.18 -lazy-object-proxy==1.4.0 # via astroid +isort==4.3.20 +lazy-object-proxy==1.4.1 # via astroid mccabe==0.6.1 # via pylint packaging==19.0 # via caniusepython3 pycodestyle==2.5.0 diff --git a/requirements/test.txt b/requirements/test.txt index 3cb82c6d1b3..8a905fa867d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --upgrade -o requirements/test.txt requirements/test.in +# make upgrade # apipkg==1.5 # via execnet appdirs==1.4.3 # via fs @@ -22,7 +22,7 @@ django-waffle==0.16.0 django-webpack-loader==0.6.0 djangorestframework-jwt==1.11.0 # via edx-drf-extensions edx-django-utils==1.0.3 # via edx-drf-extensions -edx-drf-extensions==2.2.0 +edx-drf-extensions==2.2.1 edx-i18n-tools==0.4.8 edx-opaque-keys==0.4.4 edx-rest-api-client==1.9.2 @@ -60,7 +60,7 @@ pytest-cov==2.7.1 pytest-django==3.4.8 pytest-forked==1.0.2 # via pytest-xdist pytest-xdist==1.28.0 -pytest==4.4.1 # via pytest-cov, pytest-django, pytest-forked, pytest-xdist +pytest==4.5.0 # via pytest-cov, pytest-django, pytest-forked, pytest-xdist python-dateutil==2.8.0 pytz==2019.1 pyyaml==5.1 # via edx-i18n-tools, xblock @@ -78,6 +78,7 @@ sure==1.2.7 testfixtures==6.8.2 typing==3.6.6 # via fs urllib3==1.24.3 # via requests, selenium +wcwidth==0.1.7 # via pytest web-fragments==0.3.0 # via xblock webob==1.8.5 # via xblock xblock==1.2.2 # via edx-when