Merge pull request #3220 from bdarnell/update-deps

Update all deps
tornadoweb · Jan 20, 2023 · 5953601 · 5953601
2 parents 3b4fd89 + bba8cdc
commit 5953601
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 150 deletions.
diff --git a/requirements.in b/requirements.in
@@ -2,8 +2,8 @@ black
 flake8
 mypy>=0.941
 pip-tools
-sphinx
+sphinx<6
 sphinxcontrib-asyncio
 sphinx_rtd_theme
 types-pycurl
-tox
+tox
diff --git a/requirements.txt b/requirements.txt
@@ -4,206 +4,127 @@
 #
 #    pip-compile requirements.in
 #
-alabaster==0.7.12
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
-babel==2.10.1
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
-black==22.10.0
-    # via
-    #   -c maint/requirements.txt
-    #   -r requirements.in
+alabaster==0.7.13
+    # via sphinx
+babel==2.11.0
+    # via sphinx
+black==22.12.0
+    # via -r requirements.in
 build==0.10.0
     # via pip-tools
+cachetools==5.2.1
+    # via tox
 certifi==2022.12.7
-    # via
-    #   -c docs/requirements.txt
-    #   requests
-charset-normalizer==2.0.12
-    # via
-    #   -c docs/requirements.txt
-    #   requests
+    # via requests
+chardet==5.1.0
+    # via tox
+charset-normalizer==3.0.1
+    # via requests
 click==8.1.3
     # via
-    #   -c maint/requirements.txt
     #   black
     #   pip-tools
+colorama==0.4.6
+    # via tox
 distlib==0.3.6
-    # via
-    #   -c maint/requirements.txt
-    #   virtualenv
+    # via virtualenv
 docutils==0.17.1
     # via
-    #   -c docs/requirements.txt
     #   sphinx
     #   sphinx-rtd-theme
-filelock==3.8.0
+filelock==3.9.0
     # via
-    #   -c maint/requirements.txt
     #   tox
     #   virtualenv
 flake8==6.0.0
-    # via
-    #   -c maint/requirements.txt
-    #   -r requirements.in
-idna==3.3
-    # via
-    #   -c docs/requirements.txt
-    #   requests
-imagesize==1.3.0
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+    # via -r requirements.in
+idna==3.4
+    # via requests
+imagesize==1.4.1
+    # via sphinx
 jinja2==3.1.2
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
-markupsafe==2.1.1
-    # via
-    #   -c docs/requirements.txt
-    #   jinja2
+    # via sphinx
+markupsafe==2.1.2
+    # via jinja2
 mccabe==0.7.0
-    # via
-    #   -c maint/requirements.txt
-    #   flake8
+    # via flake8
 mypy==0.991
-    # via
-    #   -c maint/requirements.txt
-    #   -r requirements.in
+    # via -r requirements.in
 mypy-extensions==0.4.3
     # via
-    #   -c maint/requirements.txt
     #   black
     #   mypy
-packaging==21.3
+packaging==23.0
     # via
-    #   -c docs/requirements.txt
-    #   -c maint/requirements.txt
     #   build
+    #   pyproject-api
     #   sphinx
     #   tox
-pathspec==0.10.2
-    # via
-    #   -c maint/requirements.txt
-    #   black
+pathspec==0.10.3
+    # via black
 pip-tools==6.12.1
     # via -r requirements.in
-platformdirs==2.5.4
+platformdirs==2.6.2
     # via
-    #   -c maint/requirements.txt
     #   black
+    #   tox
     #   virtualenv
 pluggy==1.0.0
-    # via
-    #   -c maint/requirements.txt
-    #   tox
-py==1.11.0
-    # via
-    #   -c maint/requirements.txt
-    #   tox
+    # via tox
 pycodestyle==2.10.0
-    # via
-    #   -c maint/requirements.txt
-    #   flake8
+    # via flake8
 pyflakes==3.0.1
-    # via
-    #   -c maint/requirements.txt
-    #   flake8
-pygments==2.12.0
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
-pyparsing==3.0.9
-    # via
-    #   -c docs/requirements.txt
-    #   -c maint/requirements.txt
-    #   packaging
+    # via flake8
+pygments==2.14.0
+    # via sphinx
+pyproject-api==1.5.0
+    # via tox
 pyproject-hooks==1.0.0
     # via build
-pytz==2022.1
-    # via
-    #   -c docs/requirements.txt
-    #   babel
-requests==2.27.1
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
-six==1.16.0
-    # via
-    #   -c maint/requirements.txt
-    #   tox
+pytz==2022.7.1
+    # via babel
+requests==2.28.2
+    # via sphinx
 snowballstemmer==2.2.0
+    # via sphinx
+sphinx==5.3.0
     # via
-    #   -c docs/requirements.txt
-    #   sphinx
-sphinx==5.0.1
-    # via
-    #   -c docs/requirements.txt
     #   -r requirements.in
     #   sphinx-rtd-theme
     #   sphinxcontrib-asyncio
-sphinx-rtd-theme==1.0.0
-    # via
-    #   -c docs/requirements.txt
-    #   -r requirements.in
-sphinxcontrib-applehelp==1.0.2
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+sphinx-rtd-theme==1.1.1
+    # via -r requirements.in
+sphinxcontrib-applehelp==1.0.3
+    # via sphinx
 sphinxcontrib-asyncio==0.3.0
-    # via
-    #   -c docs/requirements.txt
-    #   -r requirements.in
+    # via -r requirements.in
 sphinxcontrib-devhelp==1.0.2
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+    # via sphinx
 sphinxcontrib-htmlhelp==2.0.0
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+    # via sphinx
 sphinxcontrib-jsmath==1.0.1
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+    # via sphinx
 sphinxcontrib-qthelp==1.0.3
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+    # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
-    # via
-    #   -c docs/requirements.txt
-    #   sphinx
+    # via sphinx
 tomli==2.0.1
     # via
-    #   -c maint/requirements.txt
     #   black
     #   build
     #   mypy
+    #   pyproject-api
     #   tox
-tox==3.27.1
-    # via
-    #   -c maint/requirements.txt
-    #   -r requirements.in
-types-pycurl==7.45.1.4
-    # via
-    #   -c maint/requirements.txt
-    #   -r requirements.in
+tox==4.3.5
+    # via -r requirements.in
+types-pycurl==7.45.2.0
+    # via -r requirements.in
 typing-extensions==4.4.0
-    # via
-    #   -c maint/requirements.txt
-    #   mypy
-urllib3==1.26.9
-    # via
-    #   -c docs/requirements.txt
-    #   requests
-virtualenv==20.16.7
-    # via
-    #   -c maint/requirements.txt
-    #   tox
+    # via mypy
+urllib3==1.26.14
+    # via requests
+virtualenv==20.17.1
+    # via tox
 wheel==0.38.4
     # via pip-tools
 

diff --git a/tox.ini b/tox.ini
@@ -21,9 +21,6 @@ envlist =
         # Run the linters.
         lint
 
-# Allow shell commands in tests
-whitelist_externals = /bin/sh
-
 [testenv]
 basepython =
            py3: python3
@@ -65,6 +62,10 @@ setenv =
        {py3,py38,py39,py310,py311,pypy3}: PYTHONWARNINGS=error:::tornado
 
 
+# Allow shell commands in tests
+allowlist_externals = sh
+
+
 # All non-comment lines but the last must end in a backslash.
 # Tox filters line-by-line based on the environment name.
 commands =