Merge branch '2.2.x'

requirements/build.txt

@@ -5,13 +5,13 @@
 #
 #    pip-compile-multi
 #
-build==0.9.0
+build==0.10.0
     # via -r requirements/build.in
 packaging==23.0
     # via build
-pep517==0.13.0
+pyproject-hooks==1.0.0
     # via build
 tomli==2.0.1
     # via
     #   build
-    #   pep517
+    #   pyproject-hooks

requirements/dev.txt

@@ -8,9 +8,9 @@
 -r docs.txt
 -r tests.txt
 -r typing.txt
-build==0.9.0
+build==0.10.0
     # via pip-tools
-cachetools==5.2.0
+cachetools==5.3.0
     # via tox
 cfgv==3.3.1
     # via pre-commit
@@ -24,37 +24,35 @@ colorama==0.4.6
     # via tox
 distlib==0.3.6
     # via virtualenv
-filelock==3.8.2
+filelock==3.9.0
     # via
     #   tox
     #   virtualenv
-identify==2.5.11
+identify==2.5.18
     # via pre-commit
 nodeenv==1.7.0
     # via pre-commit
-pep517==0.13.0
-    # via build
 pip-compile-multi==2.6.1
     # via -r requirements/dev.in
-pip-tools==6.12.1
+pip-tools==6.12.2
     # via pip-compile-multi
-platformdirs==2.6.0
+platformdirs==3.0.0
     # via
     #   tox
     #   virtualenv
-pre-commit==2.20.0
+pre-commit==3.0.4
     # via -r requirements/dev.in
-pyproject-api==1.2.1
+pyproject-api==1.5.0
     # via tox
+pyproject-hooks==1.0.0
+    # via build
 pyyaml==6.0
     # via pre-commit
-toml==0.10.2
-    # via pre-commit
-toposort==1.7
+toposort==1.9
     # via pip-compile-multi
-tox==4.0.16
+tox==4.4.5
     # via -r requirements/dev.in
-virtualenv==20.17.1
+virtualenv==20.19.0
     # via
     #   pre-commit
     #   tox

requirements/docs.txt

@@ -5,13 +5,13 @@
 #
 #    pip-compile-multi
 #
-alabaster==0.7.12
+alabaster==0.7.13
     # via sphinx
 babel==2.11.0
     # via sphinx
 certifi==2022.12.7
     # via requests
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
     # via requests
 docutils==0.17.1
     # via
@@ -23,21 +23,21 @@ imagesize==1.4.1
     # via sphinx
 jinja2==3.1.2
     # via sphinx
-markupsafe==2.1.1
+markupsafe==2.1.2
     # via jinja2
-packaging==22.0
+packaging==23.0
     # via
     #   pallets-sphinx-themes
     #   sphinx
 pallets-sphinx-themes==2.0.3
     # via -r requirements/docs.in
-pygments==2.13.0
+pygments==2.14.0
     # via
     #   sphinx
     #   sphinx-tabs
-pytz==2022.7
+pytz==2022.7.1
     # via babel
-requests==2.28.1
+requests==2.28.2
     # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
@@ -52,11 +52,11 @@ sphinx-issues==3.0.1
     # via -r requirements/docs.in
 sphinx-tabs==3.3.1
     # via -r requirements/docs.in
-sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-applehelp==1.0.4
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-htmlhelp==2.0.1
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
@@ -66,5 +66,5 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-urllib3==1.26.13
+urllib3==1.26.14
     # via requests

requirements/tests.txt

@@ -11,13 +11,19 @@ attrs==22.2.0
     # via pytest
 blinker==1.5
     # via -r requirements/tests.in
-iniconfig==1.1.1
+exceptiongroup==1.1.0
     # via pytest
-packaging==22.0
+greenlet==2.0.2 ; python_version < "3.11"
+    # via -r requirements/tests.in
+iniconfig==2.0.0
+    # via pytest
+packaging==23.0
     # via pytest
 pluggy==1.0.0
     # via pytest
-pytest==7.2.0
+pytest==7.2.1
     # via -r requirements/tests.in
-python-dotenv==0.21.0
+python-dotenv==0.21.1
     # via -r requirements/tests.in
+tomli==2.0.1
+    # via pytest

requirements/typing.txt

@@ -7,19 +7,23 @@
 #
 cffi==1.15.1
     # via cryptography
-cryptography==38.0.4
+cryptography==39.0.1
     # via -r requirements/typing.in
-mypy==0.991
+mypy==1.0.0
     # via -r requirements/typing.in
-mypy-extensions==0.4.3
+mypy-extensions==1.0.0
     # via mypy
 pycparser==2.21
     # via cffi
+tomli==2.0.1
+    # via mypy
 types-contextvars==2.4.7
     # via -r requirements/typing.in
 types-dataclasses==0.6.6
     # via -r requirements/typing.in
-types-setuptools==65.6.0.2
+types-docutils==0.19.1.4
+    # via types-setuptools
+types-setuptools==67.3.0.1
     # via -r requirements/typing.in
-typing-extensions==4.4.0
+typing-extensions==4.5.0
     # via mypy

src/flask/app.py

@@ -1248,7 +1248,7 @@ class Flask(Scaffold):
         """
         cls = self.test_client_class
         if cls is None:
-            from .testing import FlaskClient as cls  # type: ignore
+            from .testing import FlaskClient as cls
         return cls(  # type: ignore
             self, self.response_class, use_cookies=use_cookies, **kwargs
         )
@@ -1266,7 +1266,7 @@ class Flask(Scaffold):
         cls = self.test_cli_runner_class
 
         if cls is None:
-            from .testing import FlaskCliRunner as cls  # type: ignore
+            from .testing import FlaskCliRunner as cls
 
         return cls(self, **kwargs)  # type: ignore