♻️ Update type annotations for improved `python-multipart` (#12407)

diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
index 5cebbf00fbc719318a77466c63b2aef6c9dce8c4..813c74620d725790d07989aa125c7d3f53e57a47 100644 (file)
--- a/fastapi/dependencies/utils.py
+++ b/fastapi/dependencies/utils.py
@@ -91,14 +91,14 @@ multipart_incorrect_install_error = (
 def ensure_multipart_is_installed() -> None:
     try:
         # __version__ is available in both multiparts, and can be mocked
-        from multipart import __version__  # type: ignore
+        from multipart import __version__
 
         assert __version__
         try:
             # parse_options_header is only available in the right multipart
-            from multipart.multipart import parse_options_header  # type: ignore
+            from multipart.multipart import parse_options_header
 
-            assert parse_options_header
+            assert parse_options_header  # type: ignore[truthy-function]
         except ImportError:
             logger.error(multipart_incorrect_install_error)
             raise RuntimeError(multipart_incorrect_install_error) from None

diff --git a/requirements-docs-tests.txt b/requirements-docs-tests.txt
index b82df49338a1bad6ab1bd9cc3a613461baf912bf..40b956e51000dc6cbd90abb77ab26d3a0c2d7030 100644 (file)
--- a/requirements-docs-tests.txt
+++ b/requirements-docs-tests.txt
@@ -1,2 +1,4 @@
 # For mkdocstrings and tests
 httpx >=0.23.0,<0.25.0
+# For linting and generating docs versions
+ruff ==0.6.4

diff --git a/requirements-tests.txt b/requirements-tests.txt
index 2f2576dd503e1be53f8e9e78e8d7d6c2425567b8..7b1f7ea1a6b2139039389b6f088086d54ac43366 100644 (file)
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -3,7 +3,6 @@
 pytest >=7.1.3,<8.0.0
 coverage[toml] >= 6.5.0,< 8.0
 mypy ==1.8.0
-ruff ==0.6.4
 dirty-equals ==0.6.0
 # TODO: once removing databases from tutorial, upgrade SQLAlchemy
 # probably when including SQLModel