Merge remote-tracking branch 'origin/2.0.x'

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ ci:
   autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.23.1
+    rev: v2.23.3
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]

requirements/dev.txt

@@ -1,30 +1,34 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile requirements/dev.in
 #
 alabaster==0.7.12
     # via sphinx
-appdirs==1.4.4
-    # via virtualenv
 asgiref==3.4.1
     # via -r requirements/tests.in
 attrs==21.2.0
     # via pytest
 babel==2.9.1
     # via sphinx
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 blinker==1.4
     # via -r requirements/tests.in
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
+cffi==1.14.6
+    # via cryptography
 cfgv==3.3.0
     # via pre-commit
-chardet==4.0.0
+charset-normalizer==2.0.4
     # via requests
 click==8.0.1
     # via pip-tools
-distlib==0.3.1
+cryptography==3.4.7
+    # via -r requirements/typing.in
+distlib==0.3.2
     # via virtualenv
 docutils==0.16
     # via
@@ -34,11 +38,11 @@ filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-greenlet==1.1.0
+greenlet==1.1.1
     # via -r requirements/tests.in
-identify==2.2.4
+identify==2.2.13
     # via pre-commit
-idna==2.10
+idna==3.2
     # via requests
 imagesize==1.2.0
     # via sphinx
@@ -54,7 +58,7 @@ mypy-extensions==0.4.3
     # via mypy
 nodeenv==1.6.0
     # via pre-commit
-packaging==20.9
+packaging==21.0
     # via
     #   pallets-sphinx-themes
     #   pytest
@@ -62,20 +66,24 @@ packaging==20.9
     #   tox
 pallets-sphinx-themes==2.0.1
     # via -r requirements/docs.in
-pep517==0.10.0
+pep517==0.11.0
     # via pip-tools
 pip-tools==6.2.0
     # via -r requirements/dev.in
+platformdirs==2.2.0
+    # via virtualenv
 pluggy==0.13.1
     # via
     #   pytest
     #   tox
-pre-commit==2.13.0
+pre-commit==2.14.0
     # via -r requirements/dev.in
 py==1.10.0
     # via
     #   pytest
     #   tox
+pycparser==2.20
+    # via cffi
 pygments==2.9.0
     # via
     #   sphinx
@@ -90,7 +98,7 @@ pytz==2021.1
     # via babel
 pyyaml==5.4.1
     # via pre-commit
-requests==2.25.1
+requests==2.26.0
     # via sphinx
 six==1.16.0
     # via
@@ -107,7 +115,7 @@ sphinx==4.1.2
     #   sphinxcontrib-log-cabinet
 sphinx-issues==1.2.0
     # via -r requirements/docs.in
-sphinx-tabs==3.1.0
+sphinx-tabs==3.2.0
     # via -r requirements/docs.in
 sphinxcontrib-applehelp==1.0.2
     # via sphinx
@@ -126,21 +134,26 @@ sphinxcontrib-serializinghtml==1.1.5
 toml==0.10.2
     # via
     #   mypy
-    #   pep517
     #   pre-commit
     #   pytest
     #   tox
+tomli==1.2.1
+    # via pep517
 tox==3.24.1
     # via -r requirements/dev.in
+types-dataclasses==0.1.7
+    # via -r requirements/typing.in
+types-setuptools==57.0.2
+    # via -r requirements/typing.in
 typing-extensions==3.10.0.0
     # via mypy
-urllib3==1.26.5
+urllib3==1.26.6
     # via requests
-virtualenv==20.4.6
+virtualenv==20.7.1
     # via
     #   pre-commit
     #   tox
-wheel==0.36.2
+wheel==0.37.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/docs.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile requirements/docs.in
@@ -8,15 +8,15 @@ alabaster==0.7.12
     # via sphinx
 babel==2.9.1
     # via sphinx
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
-chardet==4.0.0
+charset-normalizer==2.0.4
     # via requests
 docutils==0.16
     # via
     #   sphinx
     #   sphinx-tabs
-idna==2.10
+idna==3.2
     # via requests
 imagesize==1.2.0
     # via sphinx
@@ -24,7 +24,7 @@ jinja2==3.0.1
     # via sphinx
 markupsafe==2.0.1
     # via jinja2
-packaging==20.9
+packaging==21.0
     # via
     #   pallets-sphinx-themes
     #   sphinx
@@ -38,7 +38,7 @@ pyparsing==2.4.7
     # via packaging
 pytz==2021.1
     # via babel
-requests==2.25.1
+requests==2.26.0
     # via sphinx
 snowballstemmer==2.1.0
     # via sphinx
@@ -51,7 +51,7 @@ sphinx==4.1.2
     #   sphinxcontrib-log-cabinet
 sphinx-issues==1.2.0
     # via -r requirements/docs.in
-sphinx-tabs==3.1.0
+sphinx-tabs==3.2.0
     # via -r requirements/docs.in
 sphinxcontrib-applehelp==1.0.2
     # via sphinx
@@ -67,7 +67,7 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-urllib3==1.26.5
+urllib3==1.26.6
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/tests.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile requirements/tests.in
@@ -10,11 +10,11 @@ attrs==21.2.0
     # via pytest
 blinker==1.4
     # via -r requirements/tests.in
-greenlet==1.1.0
+greenlet==1.1.1
     # via -r requirements/tests.in
 iniconfig==1.1.1
     # via pytest
-packaging==20.9
+packaging==21.0
     # via pytest
 pluggy==0.13.1
     # via pytest

requirements/typing.in

@@ -1 +1,4 @@
 mypy
+types-dataclasses
+types-setuptools
+cryptography

requirements/typing.txt

@@ -1,14 +1,24 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile requirements/typing.in
 #
+cffi==1.14.6
+    # via cryptography
+cryptography==3.4.7
+    # via -r requirements/typing.in
 mypy==0.910
     # via -r requirements/typing.in
 mypy-extensions==0.4.3
     # via mypy
+pycparser==2.20
+    # via cffi
 toml==0.10.2
     # via mypy
+types-dataclasses==0.1.7
+    # via -r requirements/typing.in
+types-setuptools==57.0.2
+    # via -r requirements/typing.in
 typing-extensions==3.10.0.0
     # via mypy