From 210698482ca13ad9b031cfe4083f0991f1b92a7d Mon Sep 17 00:00:00 2001 From: Alan Zarembok Date: Thu, 23 Jan 2020 17:13:53 -0500 Subject: [PATCH] Update dependencies. --- requirements/constraints.txt | 3 ++ requirements/dev.txt | 58 ++++++++++++++++++------------------ requirements/quality.txt | 46 ++++++++++++++-------------- requirements/test.txt | 40 ++++++++++++------------- requirements/travis.txt | 22 +++++++------- setup.py | 2 +- 6 files changed, 87 insertions(+), 84 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 78200e42..57a888af 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -17,3 +17,6 @@ more-itertools==5.0.0 # Constraining this since we haven't handled newer versions of Django Rest Framework # and we want to allow edx-platform to update this separately. djangorestframework==3.9.4 + +# Constraining to older version that supports django 1.11. +django-model-utils<4.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index ca8a8a88..4bef07dd 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -22,22 +22,22 @@ click-log==0.3.2 # via edx-lint click==7.0 # via click-log, edx-lint, pip-tools configparser==4.0.2 # via importlib-metadata, pydocstyle, pylint contextlib2==0.6.0.post1 # via importlib-metadata -coverage==4.5.4 -coveralls==1.9.2 +coverage==5.0.3 +coveralls==1.10.0 cryptography==2.8 # via pyopenssl, urllib3 ddt==1.2.2 -diff-cover==2.4.1 +diff-cover==2.5.2 distlib==0.3.0 # via caniusepython3 django-model-utils==3.2.0 django-storages==1.8 -django-waffle==0.18.0 # via edx-django-utils, edx-drf-extensions -django==1.11.26 +django-waffle==0.19.0 # via edx-django-utils, edx-drf-extensions +django==1.11.27 djangorestframework-jwt==1.11.0 # via edx-drf-extensions -djangorestframework==3.9.4 +djangorestframework==3.9.4 # via edx-drf-extensions, rest-condition docopt==0.6.2 # via coveralls -docutils==0.15.2 # via readme-renderer +docutils==0.16 # via readme-renderer edx-django-oauth2-provider==1.3.5 -edx-django-utils==2.0.2 # via edx-drf-extensions +edx-django-utils==2.0.3 # via edx-drf-extensions edx-drf-extensions==2.4.5 edx-lint==1.4.1 edx-opaque-keys==2.0.1 # via edx-drf-extensions @@ -48,7 +48,7 @@ funcsigs==1.0.2 # via mock, pytest future==0.18.2 # via backports.os, pyjwkest futures==3.3.0 ; python_version == "2.7" # via caniusepython3, isort idna==2.8 # via requests, urllib3 -importlib-metadata==1.2.0 # via inflect, pluggy, pytest, tox +importlib-metadata==1.4.0 # via inflect, pluggy, pytest, tox inflect==3.0.2 # via jinja2-pluralize ipaddress==1.0.23 # via cryptography, urllib3 isort==4.3.21 @@ -60,16 +60,16 @@ markupsafe==1.1.1 # via jinja2 mccabe==0.6.1 # via pylint mock==3.0.5 more-itertools==5.0.0 # via pytest, zipp -newrelic==5.4.0.132 # via edx-django-utils -packaging==19.2 # via caniusepython3, pytest, tox +newrelic==5.4.1.134 # via edx-django-utils +packaging==20.0 # via caniusepython3, pytest, tox pathlib2==2.3.5 # via importlib-metadata, pytest, pytest-django pbr==5.4.4 # via stevedore -pillow==6.2.1 -pip-tools==4.3.0 +pillow==6.2.2 +pip-tools==4.4.0 pkginfo==1.5.0.1 # via twine -pluggy==0.13.1 # via pytest, tox +pluggy==0.13.1 # via diff-cover, pytest, tox psutil==1.2.1 # via edx-django-utils, edx-drf-extensions -py==1.8.0 # via pytest, tox +py==1.8.1 # via pytest, tox pycodestyle==2.5.0 pycparser==2.19 # via cffi pycryptodomex==3.9.4 # via pyjwkest @@ -81,13 +81,13 @@ pylint-celery==0.3 # via edx-lint pylint-django==0.11.1 # via edx-lint pylint-plugin-utils==0.6 # via pylint-celery, pylint-django pylint==1.9.5 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils -pymongo==3.9.0 # via edx-opaque-keys +pymongo==3.10.1 # via edx-opaque-keys pyopenssl==19.1.0 # via urllib3 -pyparsing==2.4.5 # via packaging -pysrt==1.1.1 +pyparsing==2.4.6 # via packaging +pysrt==1.1.2 pytest-cov==2.8.1 -pytest-django==3.7.0 -pytest==4.6.6 # via pytest-cov, pytest-django +pytest-django==3.8.0 +pytest==4.6.9 # via pytest-cov, pytest-django python-dateutil==2.8.1 # via edx-drf-extensions pytz==2019.3 # via django, fs readme-renderer==24.0 # via twine @@ -95,24 +95,24 @@ requests-toolbelt==0.9.1 # via twine requests==2.22.0 # via caniusepython3, coveralls, edx-drf-extensions, pyjwkest, requests-toolbelt, twine rest-condition==1.0.3 # via edx-drf-extensions scandir==1.10.0 # via pathlib2 -semantic-version==2.8.3 # via edx-drf-extensions +semantic-version==2.8.4 # via edx-drf-extensions shortuuid==0.5.0 # via edx-django-oauth2-provider singledispatch==3.4.0.3 # via astroid, pylint -six==1.13.0 # via astroid, bleach, cryptography, diff-cover, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pip-tools, pydocstyle, pyjwkest, pylint, pyopenssl, pytest, python-dateutil, readme-renderer, singledispatch, stevedore, tox +six==1.14.0 # via astroid, bleach, cryptography, diff-cover, django-waffle, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pip-tools, pydocstyle, pyjwkest, pylint, pyopenssl, pytest, python-dateutil, readme-renderer, singledispatch, stevedore, tox snowballstemmer==2.0.0 # via pydocstyle stevedore==1.31.0 # via edx-opaque-keys toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.14.2 -tqdm==4.40.0 # via twine +tox==3.14.3 +tqdm==4.41.1 # via twine twine==1.15.0 typing==3.7.4.1 # via fs -urllib3[secure]==1.25.7 # via coveralls, requests -virtualenv==16.7.8 # via tox -wcwidth==0.1.7 # via pytest +urllib3[secure]==1.25.8 # via coveralls, requests +virtualenv==16.7.9 # via tox +wcwidth==0.1.8 # via pytest webencodings==0.5.1 # via bleach wrapt==1.11.2 # via astroid -zipp==0.6.0 # via importlib-metadata +zipp==1.0.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools==44.0.0 # via caniusepython3, fs, twine diff --git a/requirements/quality.txt b/requirements/quality.txt index 2d303f66..ed9af939 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -21,18 +21,18 @@ click-log==0.3.2 # via edx-lint click==7.0 # via click-log, edx-lint configparser==4.0.2 # via importlib-metadata, pydocstyle, pylint contextlib2==0.6.0.post1 # via importlib-metadata -coverage==4.5.4 +coverage==5.0.3 ddt==1.2.2 distlib==0.3.0 # via caniusepython3 django-model-utils==3.2.0 django-storages==1.8 -django-waffle==0.18.0 # via edx-django-utils, edx-drf-extensions -django==1.11.26 +django-waffle==0.19.0 # via edx-django-utils, edx-drf-extensions +django==1.11.27 djangorestframework-jwt==1.11.0 # via edx-drf-extensions -djangorestframework==3.9.4 -docutils==0.15.2 # via readme-renderer +djangorestframework==3.9.4 # via edx-drf-extensions, rest-condition +docutils==0.16 # via readme-renderer edx-django-oauth2-provider==1.3.5 -edx-django-utils==2.0.2 # via edx-drf-extensions +edx-django-utils==2.0.3 # via edx-drf-extensions edx-drf-extensions==2.4.5 edx-lint==1.4.1 edx-opaque-keys==2.0.1 # via edx-drf-extensions @@ -42,22 +42,22 @@ funcsigs==1.0.2 # via mock, pytest future==0.18.2 # via backports.os, pyjwkest futures==3.3.0 ; python_version == "2.7" # via caniusepython3, isort idna==2.8 # via requests -importlib-metadata==1.2.0 # via pluggy, pytest +importlib-metadata==1.4.0 # via pluggy, pytest isort==4.3.21 lazy-object-proxy==1.4.3 # via astroid lxml==4.4.2 mccabe==0.6.1 # via pylint mock==3.0.5 more-itertools==5.0.0 # via pytest, zipp -newrelic==5.4.0.132 # via edx-django-utils -packaging==19.2 # via caniusepython3, pytest +newrelic==5.4.1.134 # via edx-django-utils +packaging==20.0 # via caniusepython3, pytest pathlib2==2.3.5 # via importlib-metadata, pytest, pytest-django pbr==5.4.4 # via stevedore -pillow==6.2.1 +pillow==6.2.2 pkginfo==1.5.0.1 # via twine pluggy==0.13.1 # via pytest psutil==1.2.1 # via edx-django-utils, edx-drf-extensions -py==1.8.0 # via pytest +py==1.8.1 # via pytest pycodestyle==2.5.0 pycryptodomex==3.9.4 # via pyjwkest pydocstyle==3.0.0 @@ -68,12 +68,12 @@ pylint-celery==0.3 # via edx-lint pylint-django==0.11.1 # via edx-lint pylint-plugin-utils==0.6 # via pylint-celery, pylint-django pylint==1.9.5 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils -pymongo==3.9.0 # via edx-opaque-keys -pyparsing==2.4.5 # via packaging -pysrt==1.1.1 +pymongo==3.10.1 # via edx-opaque-keys +pyparsing==2.4.6 # via packaging +pysrt==1.1.2 pytest-cov==2.8.1 -pytest-django==3.7.0 -pytest==4.6.6 # via pytest-cov, pytest-django +pytest-django==3.8.0 +pytest==4.6.9 # via pytest-cov, pytest-django python-dateutil==2.8.1 # via edx-drf-extensions pytz==2019.3 # via django, fs readme-renderer==24.0 # via twine @@ -81,20 +81,20 @@ requests-toolbelt==0.9.1 # via twine requests==2.22.0 # via caniusepython3, edx-drf-extensions, pyjwkest, requests-toolbelt, twine rest-condition==1.0.3 # via edx-drf-extensions scandir==1.10.0 # via pathlib2 -semantic-version==2.8.3 # via edx-drf-extensions +semantic-version==2.8.4 # via edx-drf-extensions shortuuid==0.5.0 # via edx-django-oauth2-provider singledispatch==3.4.0.3 # via astroid, pylint -six==1.13.0 # via astroid, bleach, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pydocstyle, pyjwkest, pylint, pytest, python-dateutil, readme-renderer, singledispatch, stevedore +six==1.14.0 # via astroid, bleach, django-waffle, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pydocstyle, pyjwkest, pylint, pytest, python-dateutil, readme-renderer, singledispatch, stevedore snowballstemmer==2.0.0 # via pydocstyle stevedore==1.31.0 # via edx-opaque-keys -tqdm==4.40.0 # via twine +tqdm==4.41.1 # via twine twine==1.15.0 typing==3.7.4.1 # via fs -urllib3==1.25.7 # via requests -wcwidth==0.1.7 # via pytest +urllib3==1.25.8 # via requests +wcwidth==0.1.8 # via pytest webencodings==0.5.1 # via bleach wrapt==1.11.2 # via astroid -zipp==0.6.0 # via importlib-metadata +zipp==1.0.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools==44.0.0 # via caniusepython3, fs, twine diff --git a/requirements/test.txt b/requirements/test.txt index 689040f1..405390c0 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,15 +14,15 @@ certifi==2019.11.28 # via requests chardet==3.0.4 # via pysrt, requests configparser==4.0.2 # via importlib-metadata contextlib2==0.6.0.post1 # via importlib-metadata -coverage==4.5.4 +coverage==5.0.3 ddt==1.2.2 django-model-utils==3.2.0 django-storages==1.8 -django-waffle==0.18.0 # via edx-django-utils, edx-drf-extensions +django-waffle==0.19.0 # via edx-django-utils, edx-drf-extensions djangorestframework-jwt==1.11.0 # via edx-drf-extensions -djangorestframework==3.9.4 +djangorestframework==3.9.4 # via edx-drf-extensions, rest-condition edx-django-oauth2-provider==1.3.5 -edx-django-utils==2.0.2 # via edx-drf-extensions +edx-django-utils==2.0.3 # via edx-drf-extensions edx-drf-extensions==2.4.5 edx-opaque-keys==2.0.1 # via edx-drf-extensions enum34==1.1.6 @@ -30,40 +30,40 @@ fs==2.4.11 funcsigs==1.0.2 # via mock, pytest future==0.18.2 # via backports.os, pyjwkest idna==2.8 # via requests -importlib-metadata==1.2.0 # via pluggy, pytest +importlib-metadata==1.4.0 # via pluggy, pytest lxml==4.4.2 mock==3.0.5 more-itertools==5.0.0 # via pytest, zipp -newrelic==5.4.0.132 # via edx-django-utils -packaging==19.2 # via pytest +newrelic==5.4.1.134 # via edx-django-utils +packaging==20.0 # via pytest pathlib2==2.3.5 # via importlib-metadata, pytest, pytest-django pbr==5.4.4 # via stevedore -pillow==6.2.1 +pillow==6.2.2 pluggy==0.13.1 # via pytest psutil==1.2.1 # via edx-django-utils, edx-drf-extensions -py==1.8.0 # via pytest +py==1.8.1 # via pytest pycryptodomex==3.9.4 # via pyjwkest pyjwkest==1.3.2 # via edx-drf-extensions pyjwt==1.7.1 # via djangorestframework-jwt -pymongo==3.9.0 # via edx-opaque-keys -pyparsing==2.4.5 # via packaging -pysrt==1.1.1 +pymongo==3.10.1 # via edx-opaque-keys +pyparsing==2.4.6 # via packaging +pysrt==1.1.2 pytest-cov==2.8.1 -pytest-django==3.7.0 -pytest==4.6.6 # via pytest-cov, pytest-django +pytest-django==3.8.0 +pytest==4.6.9 # via pytest-cov, pytest-django python-dateutil==2.8.1 # via edx-drf-extensions pytz==2019.3 # via django, fs requests==2.22.0 # via edx-drf-extensions, pyjwkest rest-condition==1.0.3 # via edx-drf-extensions scandir==1.10.0 # via pathlib2 -semantic-version==2.8.3 # via edx-drf-extensions +semantic-version==2.8.4 # via edx-drf-extensions shortuuid==0.5.0 # via edx-django-oauth2-provider -six==1.13.0 # via edx-drf-extensions, edx-opaque-keys, fs, mock, packaging, pathlib2, pyjwkest, pytest, python-dateutil, stevedore +six==1.14.0 # via django-waffle, edx-drf-extensions, edx-opaque-keys, fs, mock, packaging, pathlib2, pyjwkest, pytest, python-dateutil, stevedore stevedore==1.31.0 # via edx-opaque-keys typing==3.7.4.1 # via fs -urllib3==1.25.7 # via requests -wcwidth==0.1.7 # via pytest -zipp==0.6.0 # via importlib-metadata +urllib3==1.25.8 # via requests +wcwidth==0.1.8 # via pytest +zipp==1.0.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools==44.0.0 # via fs diff --git a/requirements/travis.txt b/requirements/travis.txt index 29fb7729..ea6bf395 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -9,29 +9,29 @@ cffi==1.13.2 # via cryptography chardet==3.0.4 # via requests configparser==4.0.2 # via importlib-metadata contextlib2==0.6.0.post1 # via importlib-metadata -coverage==4.5.4 # via coveralls -coveralls==1.9.2 +coverage==5.0.3 # via coveralls +coveralls==1.10.0 cryptography==2.8 # via pyopenssl, urllib3 docopt==0.6.2 # via coveralls enum34==1.1.6 # via cryptography filelock==3.0.12 # via tox idna==2.8 # via requests, urllib3 -importlib-metadata==1.2.0 # via pluggy, tox +importlib-metadata==1.4.0 # via pluggy, tox ipaddress==1.0.23 # via cryptography, urllib3 more-itertools==5.0.0 # via zipp -packaging==19.2 # via tox +packaging==20.0 # via tox pathlib2==2.3.5 # via importlib-metadata pluggy==0.13.1 # via tox -py==1.8.0 # via tox +py==1.8.1 # via tox pycparser==2.19 # via cffi pyopenssl==19.1.0 # via urllib3 -pyparsing==2.4.5 # via packaging +pyparsing==2.4.6 # via packaging requests==2.22.0 # via coveralls scandir==1.10.0 # via pathlib2 -six==1.13.0 # via cryptography, packaging, pathlib2, pyopenssl, tox +six==1.14.0 # via cryptography, packaging, pathlib2, pyopenssl, tox toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.14.2 -urllib3[secure]==1.25.7 # via coveralls, requests -virtualenv==16.7.8 # via tox -zipp==0.6.0 # via importlib-metadata +tox==3.14.3 +urllib3[secure]==1.25.8 # via coveralls, requests +virtualenv==16.7.9 # via tox +zipp==1.0.0 # via importlib-metadata diff --git a/setup.py b/setup.py index 419eaa82..45d0ab10 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def load_requirements(*requirements_paths): return list(requirements) -VERSION = '1.2.2' +VERSION = '1.2.3' if sys.argv[-1] == 'tag': print("Tagging the version on github:")