From 64a0c738c6ce56c55afb98b728f7bda949acc460 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Fri, 2 Nov 2018 13:09:09 -0400 Subject: [PATCH] maint: Update requirements Pick up a security fix in `requests`, and add mypy and black to the list. --- maint/requirements.in | 8 ++--- maint/requirements.txt | 68 +++++++++++++++++++++++++----------------- tox.ini | 3 ++ 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/maint/requirements.in b/maint/requirements.in index eeb2f4d6a3..094f7ca50c 100644 --- a/maint/requirements.in +++ b/maint/requirements.in @@ -1,8 +1,4 @@ # Requirements for tools used in the development of tornado. -# This list is for python 3.5; for 2.7 add: -# - futures -# - mock -# # Use virtualenv instead of venv; tox seems to get confused otherwise. # # maint/requirements.txt contains the pinned versions of all direct and @@ -15,10 +11,12 @@ pycares pycurl # Other useful tools -Sphinx +Sphinx<1.8.0 autopep8 +black coverage flake8 +mypy==0.630 pep8 pyflakes sphinx-rtd-theme diff --git a/maint/requirements.txt b/maint/requirements.txt index eaa02ea57b..17b8f37867 100644 --- a/maint/requirements.txt +++ b/maint/requirements.txt @@ -1,44 +1,56 @@ -alabaster==0.7.10 -attrs==17.4.0 -Automat==0.6.0 -autopep8==1.3.4 -Babel==2.5.3 -certifi==2018.1.18 +alabaster==0.7.12 +appdirs==1.4.3 +attrs==18.2.0 +Automat==0.7.0 +autopep8==1.4.2 +Babel==2.6.0 +black==18.9b0 +bleach==3.0.2 +certifi==2018.10.15 chardet==3.0.4 +Click==7.0 constantly==15.1.0 coverage==4.5.1 docutils==0.14 -flake8==3.5.0 +filelock==3.0.10 +flake8==3.6.0 hyperlink==18.0.0 -idna==2.6 -imagesize==1.0.0 +idna==2.7 +imagesize==1.1.0 incremental==17.5.0 Jinja2==2.10 MarkupSafe==1.0 mccabe==0.6.1 -packaging==17.1 +mypy==0.630 +mypy-extensions==0.4.1 +packaging==18.0 pep8==1.7.1 pkginfo==1.4.2 -pluggy==0.6.0 -py==1.5.2 +pluggy==0.8.0 +py==1.7.0 pycares==2.3.0 -pycodestyle==2.3.1 -pycurl==7.43.0.1 -pyflakes==1.6.0 +pycodestyle==2.4.0 +pycurl==7.43.0.2 +pyflakes==2.0.0 Pygments==2.2.0 -pyparsing==2.2.0 -pytz==2018.3 -requests==2.18.4 +PyHamcrest==1.9.0 +pyparsing==2.3.0 +pytz==2018.7 +readme-renderer==24.0 +requests==2.20.0 requests-toolbelt==0.8.0 six==1.11.0 snowballstemmer==1.2.1 -Sphinx==1.7.1 -sphinx-rtd-theme==0.2.4 -sphinxcontrib-websupport==1.0.1 -tox==2.9.1 -tqdm==4.19.8 -twine==1.10.0 -Twisted==17.9.0 -urllib3==1.22 -virtualenv==15.1.0 -zope.interface==4.4.3 +Sphinx==1.7.9 +sphinx-rtd-theme==0.4.2 +sphinxcontrib-websupport==1.1.0 +toml==0.10.0 +tox==3.5.3 +tqdm==4.28.1 +twine==1.12.1 +Twisted==18.9.0 +typed-ast==1.1.0 +urllib3==1.24 +virtualenv==16.1.0 +webencodings==0.5.1 +zope.interface==4.6.0 diff --git a/tox.ini b/tox.ini index f20bb4f8ac..7398f1fbbd 100644 --- a/tox.ini +++ b/tox.ini @@ -40,6 +40,9 @@ envlist = py3-lint py3-mypy +# Tox doesn't like that we specify py3==py37 +ignore_basepython_conflict=True + [testenv] # Most of these are defaults, but if you specify any you can't fall back # defaults for the others.