From: Sebastián Ramírez <tiangolo@gmail.com>
Date: Tue, 24 Oct 2023 20:26:06 +0000 (+0400)
Subject: 👷 Adopt Ruff format (#10517)
X-Git-Tag: 0.104.1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e14c69c311d89dde86e8c033df87773a3a50121;p=thirdparty%2Ffastapi%2Ffastapi.git

👷 Adopt Ruff format (#10517)

* 🔧 Update pre-commit, use ruff format

* ⬆️ Upgrade dependencies, use Ruff for formatting

* 🔧 Update Ruff config

* 🔨 Update lint and format scripts, use Ruff

* 🎨 Format internals with Ruff

* 🎨 Format docs scripts

* 🎨 Format tests

* 🎨 Format extra commas in src for docs

* 📝 Update docs mentioning `@lru_cache()`, use `@lru_cache` instead to keep consistency with the format

* 🎨 Update src for docs, use plain `@lru_cache`

* 🎨 Update src for docs format and docs references
---

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9f7085f72f..a7f2fb3f22 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,23 +13,13 @@ repos:
         -   --unsafe
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
--   repo: https://github.com/asottile/pyupgrade
-    rev: v3.7.0
-    hooks:
-    -   id: pyupgrade
-        args:
-        - --py3-plus
-        - --keep-runtime-typing
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.275
+    rev: v0.1.2
     hooks:
     -   id: ruff
         args:
         - --fix
--   repo: https://github.com/psf/black
-    rev: 23.3.0
-    hooks:
-    -   id: black
+    -   id: ruff-format
 ci:
     autofix_commit_msg: 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks
     autoupdate_commit_msg: ⬆ [pre-commit.ci] pre-commit autoupdate
diff --git a/docs/em/docs/advanced/settings.md b/docs/em/docs/advanced/settings.md
index bc50bf755a..cc7a08bab8 100644
--- a/docs/em/docs/advanced/settings.md
+++ b/docs/em/docs/advanced/settings.md
@@ -221,7 +221,7 @@ $ ADMIN_EMAIL="deadpool@example.com" APP_NAME="ChimichangApp" uvicorn main:app
 ```
 
 !!! tip
-    👥 🔜 🔬 `@lru_cache()` 🍖.
+    👥 🔜 🔬 `@lru_cache` 🍖.
 
     🔜 👆 💪 🤔 `get_settings()` 😐 🔢.
 
@@ -302,7 +302,7 @@ def get_settings():
 
 👥 🔜 ✍ 👈 🎚 🔠 📨, &amp; 👥 🔜 👂 `.env` 📁 🔠 📨. 👶 👶
 
-✋️ 👥 ⚙️ `@lru_cache()` 👨‍🎨 🔛 🔝, `Settings` 🎚 🔜 ✍ 🕴 🕐, 🥇 🕰 ⚫️ 🤙. 👶 👶
+✋️ 👥 ⚙️ `@lru_cache` 👨‍🎨 🔛 🔝, `Settings` 🎚 🔜 ✍ 🕴 🕐, 🥇 🕰 ⚫️ 🤙. 👶 👶
 
 ```Python hl_lines="1  10"
 {!../../../docs_src/settings/app03/main.py!}
@@ -312,14 +312,14 @@ def get_settings():
 
 #### `lru_cache` 📡 ℹ
 
-`@lru_cache()` 🔀 🔢 ⚫️ 🎀 📨 🎏 💲 👈 📨 🥇 🕰, ↩️ 💻 ⚫️ 🔄, 🛠️ 📟 🔢 🔠 🕰.
+`@lru_cache` 🔀 🔢 ⚫️ 🎀 📨 🎏 💲 👈 📨 🥇 🕰, ↩️ 💻 ⚫️ 🔄, 🛠️ 📟 🔢 🔠 🕰.
 
 , 🔢 🔛 ⚫️ 🔜 🛠️ 🕐 🔠 🌀 ❌. &amp; ⤴️ 💲 📨 🔠 👈 🌀 ❌ 🔜 ⚙️ 🔄 &amp; 🔄 🕐❔ 🔢 🤙 ⏮️ ⚫️❔ 🎏 🌀 ❌.
 
 🖼, 🚥 👆 ✔️ 🔢:
 
 ```Python
-@lru_cache()
+@lru_cache
 def say_hi(name: str, salutation: str = "Ms."):
     return f"Hello {salutation} {name}"
 ```
@@ -371,7 +371,7 @@ participant execute as Execute function
 
 👈 🌌, ⚫️ 🎭 🌖 🚥 ⚫️ 🌐 🔢. ✋️ ⚫️ ⚙️ 🔗 🔢, ⤴️ 👥 💪 🔐 ⚫️ 💪 🔬.
 
-`@lru_cache()` 🍕 `functools` ❔ 🍕 🐍 🐩 🗃, 👆 💪 ✍ 🌅 🔃 ⚫️ <a href="https://docs.python.org/3/library/functools.html#functools.lru_cache" class="external-link" target="_blank">🐍 🩺 `@lru_cache()`</a>.
+`@lru_cache` 🍕 `functools` ❔ 🍕 🐍 🐩 🗃, 👆 💪 ✍ 🌅 🔃 ⚫️ <a href="https://docs.python.org/3/library/functools.html#functools.lru_cache" class="external-link" target="_blank">🐍 🩺 `@lru_cache`</a>.
 
 ## 🌃
 
@@ -379,4 +379,4 @@ participant execute as Execute function
 
 * ⚙️ 🔗 👆 💪 📉 🔬.
 * 👆 💪 ⚙️ `.env` 📁 ⏮️ ⚫️.
-* ⚙️ `@lru_cache()` ➡️ 👆 ❎ 👂 🇨🇻 📁 🔄 &amp; 🔄 🔠 📨, ⏪ 🤝 👆 🔐 ⚫️ ⏮️ 🔬.
+* ⚙️ `@lru_cache` ➡️ 👆 ❎ 👂 🇨🇻 📁 🔄 &amp; 🔄 🔠 📨, ⏪ 🤝 👆 🔐 ⚫️ ⏮️ 🔬.
diff --git a/docs/em/docs/tutorial/query-params-str-validations.md b/docs/em/docs/tutorial/query-params-str-validations.md
index d6b67bd518..f0e455abe1 100644
--- a/docs/em/docs/tutorial/query-params-str-validations.md
+++ b/docs/em/docs/tutorial/query-params-str-validations.md
@@ -371,7 +371,7 @@ http://localhost:8000/items/
 
 === "🐍 3️⃣.1️⃣0️⃣ &amp; 🔛"
 
-    ```Python hl_lines="12"
+    ```Python hl_lines="11"
     {!> ../../../docs_src/query_params_str_validations/tutorial008_py310.py!}
     ```
 
@@ -421,7 +421,7 @@ http://127.0.0.1:8000/items/?item-query=foobaritems
 
 === "🐍 3️⃣.1️⃣0️⃣ &amp; 🔛"
 
-    ```Python hl_lines="17"
+    ```Python hl_lines="16"
     {!> ../../../docs_src/query_params_str_validations/tutorial010_py310.py!}
     ```
 
diff --git a/docs/en/docs/advanced/settings.md b/docs/en/docs/advanced/settings.md
index d39130777f..32df900064 100644
--- a/docs/en/docs/advanced/settings.md
+++ b/docs/en/docs/advanced/settings.md
@@ -276,7 +276,7 @@ Now we create a dependency that returns a new `config.Settings()`.
     ```
 
 !!! tip
-    We'll discuss the `@lru_cache()` in a bit.
+    We'll discuss the `@lru_cache` in a bit.
 
     For now you can assume `get_settings()` is a normal function.
 
@@ -388,7 +388,7 @@ def get_settings():
 
 we would create that object for each request, and we would be reading the `.env` file for each request. ⚠️
 
-But as we are using the `@lru_cache()` decorator on top, the `Settings` object will be created only once, the first time it's called. ✔️
+But as we are using the `@lru_cache` decorator on top, the `Settings` object will be created only once, the first time it's called. ✔️
 
 === "Python 3.9+"
 
@@ -415,14 +415,14 @@ Then for any subsequent calls of `get_settings()` in the dependencies for the ne
 
 #### `lru_cache` Technical Details
 
-`@lru_cache()` modifies the function it decorates to return the same value that was returned the first time, instead of computing it again, executing the code of the function every time.
+`@lru_cache` modifies the function it decorates to return the same value that was returned the first time, instead of computing it again, executing the code of the function every time.
 
 So, the function below it will be executed once for each combination of arguments. And then the values returned by each of those combinations of arguments will be used again and again whenever the function is called with exactly the same combination of arguments.
 
 For example, if you have a function:
 
 ```Python
-@lru_cache()
+@lru_cache
 def say_hi(name: str, salutation: str = "Ms."):
     return f"Hello {salutation} {name}"
 ```
@@ -474,7 +474,7 @@ In the case of our dependency `get_settings()`, the function doesn't even take a
 
 That way, it behaves almost as if it was just a global variable. But as it uses a dependency function, then we can override it easily for testing.
 
-`@lru_cache()` is part of `functools` which is part of Python's standard library, you can read more about it in the <a href="https://docs.python.org/3/library/functools.html#functools.lru_cache" class="external-link" target="_blank">Python docs for `@lru_cache()`</a>.
+`@lru_cache` is part of `functools` which is part of Python's standard library, you can read more about it in the <a href="https://docs.python.org/3/library/functools.html#functools.lru_cache" class="external-link" target="_blank">Python docs for `@lru_cache`</a>.
 
 ## Recap
 
@@ -482,4 +482,4 @@ You can use Pydantic Settings to handle the settings or configurations for your
 
 * By using a dependency you can simplify testing.
 * You can use `.env` files with it.
-* Using `@lru_cache()` lets you avoid reading the dotenv file again and again for each request, while allowing you to override it during testing.
+* Using `@lru_cache` lets you avoid reading the dotenv file again and again for each request, while allowing you to override it during testing.
diff --git a/docs/en/docs/tutorial/query-params-str-validations.md b/docs/en/docs/tutorial/query-params-str-validations.md
index 0e777f6a09..91ae615fff 100644
--- a/docs/en/docs/tutorial/query-params-str-validations.md
+++ b/docs/en/docs/tutorial/query-params-str-validations.md
@@ -737,7 +737,7 @@ And a `description`:
     !!! tip
         Prefer to use the `Annotated` version if possible.
 
-    ```Python hl_lines="12"
+    ```Python hl_lines="11"
     {!> ../../../docs_src/query_params_str_validations/tutorial008_py310.py!}
     ```
 
@@ -835,7 +835,7 @@ Then pass the parameter `deprecated=True` to `Query`:
     !!! tip
         Prefer to use the `Annotated` version if possible.
 
-    ```Python hl_lines="17"
+    ```Python hl_lines="16"
     {!> ../../../docs_src/query_params_str_validations/tutorial010_py310.py!}
     ```
 
diff --git a/docs/ru/docs/tutorial/query-params-str-validations.md b/docs/ru/docs/tutorial/query-params-str-validations.md
index 15be5dbf6b..cc826b8711 100644
--- a/docs/ru/docs/tutorial/query-params-str-validations.md
+++ b/docs/ru/docs/tutorial/query-params-str-validations.md
@@ -741,7 +741,7 @@ http://localhost:8000/items/
     !!! tip "Подсказка"
         Рекомендуется использовать версию с `Annotated` если возможно.
 
-    ```Python hl_lines="12"
+    ```Python hl_lines="11"
     {!> ../../../docs_src/query_params_str_validations/tutorial008_py310.py!}
     ```
 
@@ -839,7 +839,7 @@ http://127.0.0.1:8000/items/?item-query=foobaritems
     !!! tip "Подсказка"
         Рекомендуется использовать версию с `Annotated` если возможно.
 
-    ```Python hl_lines="17"
+    ```Python hl_lines="16"
     {!> ../../../docs_src/query_params_str_validations/tutorial010_py310.py!}
     ```
 
diff --git a/docs/zh/docs/advanced/settings.md b/docs/zh/docs/advanced/settings.md
index 7f718acefb..93e48a6105 100644
--- a/docs/zh/docs/advanced/settings.md
+++ b/docs/zh/docs/advanced/settings.md
@@ -239,7 +239,7 @@ $ ADMIN_EMAIL="deadpool@example.com" APP_NAME="ChimichangApp"uvicorn main:app
     ```
 
 !!! tip
-    我们稍后会讨论 `@lru_cache()`。
+    我们稍后会讨论 `@lru_cache`。
 
     目前，您可以将 `get_settings()` 视为普通函数。
 
@@ -337,7 +337,7 @@ def get_settings():
 
 我们将为每个请求创建该对象，并且将在每个请求中读取 `.env` 文件。 ⚠️
 
-但是，由于我们在顶部使用了 `@lru_cache()` 装饰器，因此只有在第一次调用它时，才会创建 `Settings` 对象一次。 ✔️
+但是，由于我们在顶部使用了 `@lru_cache` 装饰器，因此只有在第一次调用它时，才会创建 `Settings` 对象一次。 ✔️
 
 === "Python 3.9+"
 
@@ -364,13 +364,13 @@ def get_settings():
 
 #### `lru_cache` 技术细节
 
-`@lru_cache()` 修改了它所装饰的函数，以返回第一次返回的相同值，而不是再次计算它，每次都执行函数的代码。
+`@lru_cache` 修改了它所装饰的函数，以返回第一次返回的相同值，而不是再次计算它，每次都执行函数的代码。
 
 因此，下面的函数将对每个参数组合执行一次。然后，每个参数组合返回的值将在使用完全相同的参数组合调用函数时再次使用。
 
 例如，如果您有一个函数：
 ```Python
-@lru_cache()
+@lru_cache
 def say_hi(name: str, salutation: str = "Ms."):
     return f"Hello {salutation} {name}"
 ```
@@ -422,7 +422,7 @@ participant execute as Execute function
 
 这样，它的行为几乎就像是一个全局变量。但是由于它使用了依赖项函数，因此我们可以轻松地进行测试时的覆盖。
 
-`@lru_cache()` 是 `functools` 的一部分，它是 Python 标准库的一部分，您可以在<a href="https://docs.python.org/3/library/functools.html#functools.lru_cache" class="external-link" target="_blank">Python 文档中了解有关 `@lru_cache()` 的更多信息</a>。
+`@lru_cache` 是 `functools` 的一部分，它是 Python 标准库的一部分，您可以在<a href="https://docs.python.org/3/library/functools.html#functools.lru_cache" class="external-link" target="_blank">Python 文档中了解有关 `@lru_cache` 的更多信息</a>。
 
 ## 小结
 
@@ -430,4 +430,4 @@ participant execute as Execute function
 
 * 通过使用依赖项，您可以简化测试。
 * 您可以使用 `.env` 文件。
-* 使用 `@lru_cache()` 可以避免为每个请求重复读取 dotenv 文件，同时允许您在测试时进行覆盖。
+* 使用 `@lru_cache` 可以避免为每个请求重复读取 dotenv 文件，同时允许您在测试时进行覆盖。
diff --git a/docs_src/header_params/tutorial002_an.py b/docs_src/header_params/tutorial002_an.py
index 65d972d46e..82fe49ba2b 100644
--- a/docs_src/header_params/tutorial002_an.py
+++ b/docs_src/header_params/tutorial002_an.py
@@ -10,6 +10,6 @@ app = FastAPI()
 async def read_items(
     strange_header: Annotated[
         Union[str, None], Header(convert_underscores=False)
-    ] = None
+    ] = None,
 ):
     return {"strange_header": strange_header}
diff --git a/docs_src/header_params/tutorial002_an_py39.py b/docs_src/header_params/tutorial002_an_py39.py
index 7f6a99f9c3..008e4b6e1a 100644
--- a/docs_src/header_params/tutorial002_an_py39.py
+++ b/docs_src/header_params/tutorial002_an_py39.py
@@ -9,6 +9,6 @@ app = FastAPI()
 async def read_items(
     strange_header: Annotated[
         Union[str, None], Header(convert_underscores=False)
-    ] = None
+    ] = None,
 ):
     return {"strange_header": strange_header}
diff --git a/docs_src/query_params_str_validations/tutorial004.py b/docs_src/query_params_str_validations/tutorial004.py
index 3639b6c38f..64a647a16a 100644
--- a/docs_src/query_params_str_validations/tutorial004.py
+++ b/docs_src/query_params_str_validations/tutorial004.py
@@ -9,7 +9,7 @@ app = FastAPI()
 async def read_items(
     q: Union[str, None] = Query(
         default=None, min_length=3, max_length=50, pattern="^fixedquery$"
-    )
+    ),
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial004_an.py b/docs_src/query_params_str_validations/tutorial004_an.py
index 24698c7b34..c75d45d63e 100644
--- a/docs_src/query_params_str_validations/tutorial004_an.py
+++ b/docs_src/query_params_str_validations/tutorial004_an.py
@@ -10,7 +10,7 @@ app = FastAPI()
 async def read_items(
     q: Annotated[
         Union[str, None], Query(min_length=3, max_length=50, pattern="^fixedquery$")
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial004_an_py310.py b/docs_src/query_params_str_validations/tutorial004_an_py310.py
index b7b629ee8a..20cf1988fd 100644
--- a/docs_src/query_params_str_validations/tutorial004_an_py310.py
+++ b/docs_src/query_params_str_validations/tutorial004_an_py310.py
@@ -9,7 +9,7 @@ app = FastAPI()
 async def read_items(
     q: Annotated[
         str | None, Query(min_length=3, max_length=50, pattern="^fixedquery$")
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial004_an_py310_regex.py b/docs_src/query_params_str_validations/tutorial004_an_py310_regex.py
index 8fd375b3d5..21e0d3eb85 100644
--- a/docs_src/query_params_str_validations/tutorial004_an_py310_regex.py
+++ b/docs_src/query_params_str_validations/tutorial004_an_py310_regex.py
@@ -9,7 +9,7 @@ app = FastAPI()
 async def read_items(
     q: Annotated[
         str | None, Query(min_length=3, max_length=50, regex="^fixedquery$")
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial004_an_py39.py b/docs_src/query_params_str_validations/tutorial004_an_py39.py
index 8e9a6fc32d..de27097b38 100644
--- a/docs_src/query_params_str_validations/tutorial004_an_py39.py
+++ b/docs_src/query_params_str_validations/tutorial004_an_py39.py
@@ -9,7 +9,7 @@ app = FastAPI()
 async def read_items(
     q: Annotated[
         Union[str, None], Query(min_length=3, max_length=50, pattern="^fixedquery$")
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial004_py310.py b/docs_src/query_params_str_validations/tutorial004_py310.py
index f80798bcb8..7801e75000 100644
--- a/docs_src/query_params_str_validations/tutorial004_py310.py
+++ b/docs_src/query_params_str_validations/tutorial004_py310.py
@@ -5,8 +5,9 @@ app = FastAPI()
 
 @app.get("/items/")
 async def read_items(
-    q: str
-    | None = Query(default=None, min_length=3, max_length=50, pattern="^fixedquery$")
+    q: str | None = Query(
+        default=None, min_length=3, max_length=50, pattern="^fixedquery$"
+    ),
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial008.py b/docs_src/query_params_str_validations/tutorial008.py
index d112a9ab8a..e3e0b50aa1 100644
--- a/docs_src/query_params_str_validations/tutorial008.py
+++ b/docs_src/query_params_str_validations/tutorial008.py
@@ -12,7 +12,7 @@ async def read_items(
         title="Query string",
         description="Query string for the items to search in the database that have a good match",
         min_length=3,
-    )
+    ),
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial008_an.py b/docs_src/query_params_str_validations/tutorial008_an.py
index 5699f1e88d..01606a9203 100644
--- a/docs_src/query_params_str_validations/tutorial008_an.py
+++ b/docs_src/query_params_str_validations/tutorial008_an.py
@@ -15,7 +15,7 @@ async def read_items(
             description="Query string for the items to search in the database that have a good match",
             min_length=3,
         ),
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial008_an_py310.py b/docs_src/query_params_str_validations/tutorial008_an_py310.py
index 4aaadf8b47..44b3082b63 100644
--- a/docs_src/query_params_str_validations/tutorial008_an_py310.py
+++ b/docs_src/query_params_str_validations/tutorial008_an_py310.py
@@ -14,7 +14,7 @@ async def read_items(
             description="Query string for the items to search in the database that have a good match",
             min_length=3,
         ),
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial008_an_py39.py b/docs_src/query_params_str_validations/tutorial008_an_py39.py
index 1c3b361765..f3f2f2c0e7 100644
--- a/docs_src/query_params_str_validations/tutorial008_an_py39.py
+++ b/docs_src/query_params_str_validations/tutorial008_an_py39.py
@@ -14,7 +14,7 @@ async def read_items(
             description="Query string for the items to search in the database that have a good match",
             min_length=3,
         ),
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial008_py310.py b/docs_src/query_params_str_validations/tutorial008_py310.py
index 489f631d5e..5743852726 100644
--- a/docs_src/query_params_str_validations/tutorial008_py310.py
+++ b/docs_src/query_params_str_validations/tutorial008_py310.py
@@ -5,13 +5,12 @@ app = FastAPI()
 
 @app.get("/items/")
 async def read_items(
-    q: str
-    | None = Query(
+    q: str | None = Query(
         default=None,
         title="Query string",
         description="Query string for the items to search in the database that have a good match",
         min_length=3,
-    )
+    ),
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial010.py b/docs_src/query_params_str_validations/tutorial010.py
index 3314f8b6d6..ff29176fe5 100644
--- a/docs_src/query_params_str_validations/tutorial010.py
+++ b/docs_src/query_params_str_validations/tutorial010.py
@@ -16,7 +16,7 @@ async def read_items(
         max_length=50,
         pattern="^fixedquery$",
         deprecated=True,
-    )
+    ),
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial010_an.py b/docs_src/query_params_str_validations/tutorial010_an.py
index c5df00897f..ed343230f4 100644
--- a/docs_src/query_params_str_validations/tutorial010_an.py
+++ b/docs_src/query_params_str_validations/tutorial010_an.py
@@ -19,7 +19,7 @@ async def read_items(
             pattern="^fixedquery$",
             deprecated=True,
         ),
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial010_an_py310.py b/docs_src/query_params_str_validations/tutorial010_an_py310.py
index a8e8c099b5..775095bda8 100644
--- a/docs_src/query_params_str_validations/tutorial010_an_py310.py
+++ b/docs_src/query_params_str_validations/tutorial010_an_py310.py
@@ -18,7 +18,7 @@ async def read_items(
             pattern="^fixedquery$",
             deprecated=True,
         ),
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial010_an_py39.py b/docs_src/query_params_str_validations/tutorial010_an_py39.py
index 955880dd6a..b126c116f0 100644
--- a/docs_src/query_params_str_validations/tutorial010_an_py39.py
+++ b/docs_src/query_params_str_validations/tutorial010_an_py39.py
@@ -18,7 +18,7 @@ async def read_items(
             pattern="^fixedquery$",
             deprecated=True,
         ),
-    ] = None
+    ] = None,
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/query_params_str_validations/tutorial010_py310.py b/docs_src/query_params_str_validations/tutorial010_py310.py
index 9ea7b3c49f..530e6cf5b6 100644
--- a/docs_src/query_params_str_validations/tutorial010_py310.py
+++ b/docs_src/query_params_str_validations/tutorial010_py310.py
@@ -5,8 +5,7 @@ app = FastAPI()
 
 @app.get("/items/")
 async def read_items(
-    q: str
-    | None = Query(
+    q: str | None = Query(
         default=None,
         alias="item-query",
         title="Query string",
@@ -15,7 +14,7 @@ async def read_items(
         max_length=50,
         pattern="^fixedquery$",
         deprecated=True,
-    )
+    ),
 ):
     results = {"items": [{"item_id": "Foo"}, {"item_id": "Bar"}]}
     if q:
diff --git a/docs_src/settings/app02/main.py b/docs_src/settings/app02/main.py
index 163aa26142..941f82e6b3 100644
--- a/docs_src/settings/app02/main.py
+++ b/docs_src/settings/app02/main.py
@@ -7,7 +7,7 @@ from .config import Settings
 app = FastAPI()
 
 
-@lru_cache()
+@lru_cache
 def get_settings():
     return Settings()
 
diff --git a/docs_src/settings/app02_an/main.py b/docs_src/settings/app02_an/main.py
index cb679202d6..3a578cc338 100644
--- a/docs_src/settings/app02_an/main.py
+++ b/docs_src/settings/app02_an/main.py
@@ -8,7 +8,7 @@ from .config import Settings
 app = FastAPI()
 
 
-@lru_cache()
+@lru_cache
 def get_settings():
     return Settings()
 
diff --git a/docs_src/settings/app02_an_py39/main.py b/docs_src/settings/app02_an_py39/main.py
index 61be74fcb9..6d5db12a87 100644
--- a/docs_src/settings/app02_an_py39/main.py
+++ b/docs_src/settings/app02_an_py39/main.py
@@ -8,7 +8,7 @@ from .config import Settings
 app = FastAPI()
 
 
-@lru_cache()
+@lru_cache
 def get_settings():
     return Settings()
 
diff --git a/docs_src/settings/app03/main.py b/docs_src/settings/app03/main.py
index 69bc8c6e0e..ea64a5709c 100644
--- a/docs_src/settings/app03/main.py
+++ b/docs_src/settings/app03/main.py
@@ -7,7 +7,7 @@ from . import config
 app = FastAPI()
 
 
-@lru_cache()
+@lru_cache
 def get_settings():
     return config.Settings()
 
diff --git a/docs_src/settings/app03_an/main.py b/docs_src/settings/app03_an/main.py
index c33b98f474..2f64b9cd17 100644
--- a/docs_src/settings/app03_an/main.py
+++ b/docs_src/settings/app03_an/main.py
@@ -8,7 +8,7 @@ from . import config
 app = FastAPI()
 
 
-@lru_cache()
+@lru_cache
 def get_settings():
     return config.Settings()
 
diff --git a/docs_src/settings/app03_an_py39/main.py b/docs_src/settings/app03_an_py39/main.py
index b89c6b6cf4..62f3476396 100644
--- a/docs_src/settings/app03_an_py39/main.py
+++ b/docs_src/settings/app03_an_py39/main.py
@@ -8,7 +8,7 @@ from . import config
 app = FastAPI()
 
 
-@lru_cache()
+@lru_cache
 def get_settings():
     return config.Settings()
 
diff --git a/fastapi/_compat.py b/fastapi/_compat.py
index a4b305d429..fc605d0ec6 100644
--- a/fastapi/_compat.py
+++ b/fastapi/_compat.py
@@ -197,9 +197,9 @@ if PYDANTIC_V2:
         if "$ref" not in json_schema:
             # TODO remove when deprecating Pydantic v1
             # Ref: https://github.com/pydantic/pydantic/blob/d61792cc42c80b13b23e3ffa74bc37ec7c77f7d1/pydantic/schema.py#L207
-            json_schema[
-                "title"
-            ] = field.field_info.title or field.alias.title().replace("_", " ")
+            json_schema["title"] = (
+                field.field_info.title or field.alias.title().replace("_", " ")
+            )
         return json_schema
 
     def get_compat_model_name_map(fields: List[ModelField]) -> ModelNameMap:
diff --git a/fastapi/applications.py b/fastapi/applications.py
index 8ca374a54e..3021d75937 100644
--- a/fastapi/applications.py
+++ b/fastapi/applications.py
@@ -896,9 +896,7 @@ class FastAPI(Starlette):
                 [FastAPI docs for OpenAPI Webhooks](https://fastapi.tiangolo.com/advanced/openapi-webhooks/).
                 """
             ),
-        ] = (
-            webhooks or routing.APIRouter()
-        )
+        ] = webhooks or routing.APIRouter()
         self.root_path = root_path or openapi_prefix
         self.state: Annotated[
             State,
@@ -951,7 +949,7 @@ class FastAPI(Starlette):
         )
         self.exception_handlers: Dict[
             Any, Callable[[Request, Any], Union[Response, Awaitable[Response]]]
-        ] = ({} if exception_handlers is None else dict(exception_handlers))
+        ] = {} if exception_handlers is None else dict(exception_handlers)
         self.exception_handlers.setdefault(HTTPException, http_exception_handler)
         self.exception_handlers.setdefault(
             RequestValidationError, request_validation_exception_handler
diff --git a/fastapi/security/http.py b/fastapi/security/http.py
index 3627777d67..738455de38 100644
--- a/fastapi/security/http.py
+++ b/fastapi/security/http.py
@@ -210,7 +210,7 @@ class HTTPBasic(HTTPBase):
         try:
             data = b64decode(param).decode("ascii")
         except (ValueError, UnicodeDecodeError, binascii.Error):
-            raise invalid_user_credentials_exc
+            raise invalid_user_credentials_exc  # noqa: B904
         username, separator, password = data.partition(":")
         if not separator:
             raise invalid_user_credentials_exc
diff --git a/fastapi/security/oauth2.py b/fastapi/security/oauth2.py
index d427783add..9281dfb64f 100644
--- a/fastapi/security/oauth2.py
+++ b/fastapi/security/oauth2.py
@@ -626,9 +626,7 @@ class SecurityScopes:
                 The list of all the scopes required by dependencies.
                 """
             ),
-        ] = (
-            scopes or []
-        )
+        ] = scopes or []
         self.scope_str: Annotated[
             str,
             Doc(
diff --git a/fastapi/utils.py b/fastapi/utils.py
index 53b47a1604..f8463dda24 100644
--- a/fastapi/utils.py
+++ b/fastapi/utils.py
@@ -152,7 +152,8 @@ def create_cloned_field(
         ]
     if field.key_field:  # type: ignore[attr-defined]
         new_field.key_field = create_cloned_field(  # type: ignore[attr-defined]
-            field.key_field, cloned_types=cloned_types  # type: ignore[attr-defined]
+            field.key_field,  # type: ignore[attr-defined]
+            cloned_types=cloned_types,
         )
     new_field.validators = field.validators  # type: ignore[attr-defined]
     new_field.pre_validators = field.pre_validators  # type: ignore[attr-defined]
diff --git a/pyproject.toml b/pyproject.toml
index addde1d33f..e67486ae31 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -130,11 +130,13 @@ select = [
     "I",  # isort
     "C",  # flake8-comprehensions
     "B",  # flake8-bugbear
+    "UP",  # pyupgrade
 ]
 ignore = [
     "E501",  # line too long, handled by black
     "B008",  # do not perform function calls in argument defaults
     "C901",  # too complex
+    "W191", # indentation contains tabs
 ]
 
 [tool.ruff.per-file-ignores]
@@ -154,6 +156,22 @@ ignore = [
 "docs_src/query_params_str_validations/tutorial012_an_py39.py" = ["B006"]
 "docs_src/query_params_str_validations/tutorial013_an.py" = ["B006"]
 "docs_src/query_params_str_validations/tutorial013_an_py39.py" = ["B006"]
+"docs_src/security/tutorial004.py" = ["B904"]
+"docs_src/security/tutorial004_an.py" = ["B904"]
+"docs_src/security/tutorial004_an_py310.py" = ["B904"]
+"docs_src/security/tutorial004_an_py39.py" = ["B904"]
+"docs_src/security/tutorial004_py310.py" = ["B904"]
+"docs_src/security/tutorial005.py" = ["B904"]
+"docs_src/security/tutorial005_an.py" = ["B904"]
+"docs_src/security/tutorial005_an_py310.py" = ["B904"]
+"docs_src/security/tutorial005_an_py39.py" = ["B904"]
+"docs_src/security/tutorial005_py310.py" = ["B904"]
+"docs_src/security/tutorial005_py39.py" = ["B904"]
+
 
 [tool.ruff.isort]
 known-third-party = ["fastapi", "pydantic", "starlette"]
+
+[tool.ruff.pyupgrade]
+# Preserve types, even if a file imports `from __future__ import annotations`.
+keep-runtime-typing = true
diff --git a/requirements-docs-tests.txt b/requirements-docs-tests.txt
index 1a4a572679..b82df49338 100644
--- a/requirements-docs-tests.txt
+++ b/requirements-docs-tests.txt
@@ -1,3 +1,2 @@
 # For mkdocstrings and tests
 httpx >=0.23.0,<0.25.0
-black == 23.3.0
diff --git a/requirements-docs.txt b/requirements-docs.txt
index 3e0df64839..69302f655e 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -15,3 +15,5 @@ pillow==9.5.0
 cairosvg==2.7.0
 mkdocstrings[python]==0.23.0
 griffe-typingdoc==0.2.2
+# For griffe, it formats with black
+black==23.3.0
diff --git a/requirements-tests.txt b/requirements-tests.txt
index de8d3f26ce..e1a976c138 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -4,7 +4,7 @@ pydantic-settings >=2.0.0
 pytest >=7.1.3,<8.0.0
 coverage[toml] >= 6.5.0,< 8.0
 mypy ==1.4.1
-ruff ==0.0.275
+ruff ==0.1.2
 email_validator >=1.1.1,<3.0.0
 dirty-equals ==0.6.0
 # TODO: once removing databases from tutorial, upgrade SQLAlchemy
diff --git a/scripts/docs.py b/scripts/docs.py
index 0023c670cd..73e1900ada 100644
--- a/scripts/docs.py
+++ b/scripts/docs.py
@@ -36,7 +36,7 @@ site_path = Path("site").absolute()
 build_site_path = Path("site_build").absolute()
 
 
-@lru_cache()
+@lru_cache
 def is_mkdocs_insiders() -> bool:
     version = metadata.version("mkdocs-material")
     return "insiders" in version
@@ -104,7 +104,7 @@ def new_lang(lang: str = typer.Argument(..., callback=lang_callback)):
 def build_lang(
     lang: str = typer.Argument(
         ..., callback=lang_callback, autocompletion=complete_existing_lang
-    )
+    ),
 ) -> None:
     """
     Build the docs for a language.
@@ -251,7 +251,7 @@ def serve() -> None:
 def live(
     lang: str = typer.Argument(
         None, callback=lang_callback, autocompletion=complete_existing_lang
-    )
+    ),
 ) -> None:
     """
     Serve with livereload a docs site for a specific language.
diff --git a/scripts/format.sh b/scripts/format.sh
index 3fb3eb4f19..11f25f1ce8 100755
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -2,4 +2,4 @@
 set -x
 
 ruff fastapi tests docs_src scripts --fix
-black fastapi tests docs_src scripts
+ruff format fastapi tests docs_src scripts
diff --git a/scripts/lint.sh b/scripts/lint.sh
index 4db5caa962..c0e24db9f6 100755
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -5,4 +5,4 @@ set -x
 
 mypy fastapi
 ruff fastapi tests docs_src scripts
-black fastapi tests --check
+ruff format fastapi tests --check
diff --git a/scripts/mkdocs_hooks.py b/scripts/mkdocs_hooks.py
index 2b6a056420..8335a13f62 100644
--- a/scripts/mkdocs_hooks.py
+++ b/scripts/mkdocs_hooks.py
@@ -14,14 +14,14 @@ non_traslated_sections = [
 ]
 
 
-@lru_cache()
+@lru_cache
 def get_missing_translation_content(docs_dir: str) -> str:
     docs_dir_path = Path(docs_dir)
     missing_translation_path = docs_dir_path.parent.parent / "missing-translation.md"
     return missing_translation_path.read_text(encoding="utf-8")
 
 
-@lru_cache()
+@lru_cache
 def get_mkdocs_material_langs() -> List[str]:
     material_path = Path(material.__file__).parent
     material_langs_path = material_path / "templates" / "partials" / "languages"
diff --git a/tests/test_openapi_examples.py b/tests/test_openapi_examples.py
index 70664a8a4c..6597e5058b 100644
--- a/tests/test_openapi_examples.py
+++ b/tests/test_openapi_examples.py
@@ -28,7 +28,7 @@ def examples(
                 "value": {"data": "Data in Body examples, example2"},
             },
         },
-    )
+    ),
 ):
     return item
 
diff --git a/tests/test_schema_extra_examples.py b/tests/test_schema_extra_examples.py
index a1505afe23..b313f47e90 100644
--- a/tests/test_schema_extra_examples.py
+++ b/tests/test_schema_extra_examples.py
@@ -40,7 +40,7 @@ def create_app():
                 {"data": "Data in Body examples, example1"},
                 {"data": "Data in Body examples, example2"},
             ],
-        )
+        ),
     ):
         return item
 
@@ -54,7 +54,7 @@ def create_app():
                     {"data": "examples example_examples 1"},
                     {"data": "examples example_examples 2"},
                 ],
-            )
+            ),
         ):
             return item