From 1e853aaf6d882b261b46f08d504a8b87a4a7ad91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 04:21:45 +0100 Subject: [PATCH] =?utf8?q?=E2=AC=86=20Bump=20ruff=20from=200.6.2=20to=200.?= =?utf8?q?9.6=20(#1294)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * ⬆ Bump ruff from 0.6.2 to 0.9.6 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.6.2 to 0.9.6. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.6.2...0.9.6) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * format with ruff 0.9.6 * 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks * also bump in pre-commit config * 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sofie Van Landeghem Co-authored-by: svlandeg Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- requirements-tests.txt | 2 +- sqlmodel/main.py | 6 ++---- .../test_fastapi/test_update/test_tutorial001.py | 8 ++++---- .../test_update/test_tutorial001_py310.py | 8 ++++---- .../test_update/test_tutorial001_py39.py | 8 ++++---- .../test_fastapi/test_update/test_tutorial002.py | 12 ++++++------ .../test_update/test_tutorial002_py310.py | 12 ++++++------ .../test_update/test_tutorial002_py39.py | 12 ++++++------ 9 files changed, 34 insertions(+), 36 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4b1b10a6..c385ccfd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.5 + rev: v0.9.6 hooks: - id: ruff args: diff --git a/requirements-tests.txt b/requirements-tests.txt index f378d8fa..b33f3bf1 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -3,7 +3,7 @@ pytest >=7.0.1,<8.0.0 coverage[toml] >=6.2,<8.0 mypy ==1.4.1 -ruff ==0.6.2 +ruff ==0.9.6 # For FastAPI tests fastapi >=0.103.2 httpx ==0.24.1 diff --git a/sqlmodel/main.py b/sqlmodel/main.py index 317ef6cc..45a41997 100644 --- a/sqlmodel/main.py +++ b/sqlmodel/main.py @@ -134,8 +134,7 @@ class FieldInfo(PydanticFieldInfo): ) if primary_key is not Undefined: raise RuntimeError( - "Passing primary_key is not supported when " - "also passing a sa_column" + "Passing primary_key is not supported when also passing a sa_column" ) if nullable is not Undefined: raise RuntimeError( @@ -143,8 +142,7 @@ class FieldInfo(PydanticFieldInfo): ) if foreign_key is not Undefined: raise RuntimeError( - "Passing foreign_key is not supported when " - "also passing a sa_column" + "Passing foreign_key is not supported when also passing a sa_column" ) if ondelete is not Undefined: raise RuntimeError( diff --git a/tests/test_tutorial/test_fastapi/test_update/test_tutorial001.py b/tests/test_tutorial/test_fastapi/test_update/test_tutorial001.py index 0856b246..6f385691 100644 --- a/tests/test_tutorial/test_fastapi/test_update/test_tutorial001.py +++ b/tests/test_tutorial/test_fastapi/test_update/test_tutorial001.py @@ -49,16 +49,16 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero2_data["name"], "The name should not be set to none" - assert ( - data["secret_name"] == "Spider-Youngster" - ), "The secret name should be updated" + assert data["secret_name"] == "Spider-Youngster", ( + "The secret name should be updated" + ) response = client.patch(f"/heroes/{hero3_id}", json={"age": None}) data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero3_data["name"] assert data["age"] is None, ( - "A field should be updatable to None, even if " "that's the default" + "A field should be updatable to None, even if that's the default" ) response = client.patch("/heroes/9001", json={"name": "Dragon Cube X"}) diff --git a/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py310.py b/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py310.py index d79b2ece..119634dc 100644 --- a/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py310.py +++ b/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py310.py @@ -52,16 +52,16 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero2_data["name"], "The name should not be set to none" - assert ( - data["secret_name"] == "Spider-Youngster" - ), "The secret name should be updated" + assert data["secret_name"] == "Spider-Youngster", ( + "The secret name should be updated" + ) response = client.patch(f"/heroes/{hero3_id}", json={"age": None}) data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero3_data["name"] assert data["age"] is None, ( - "A field should be updatable to None, even if " "that's the default" + "A field should be updatable to None, even if that's the default" ) response = client.patch("/heroes/9001", json={"name": "Dragon Cube X"}) diff --git a/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py39.py b/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py39.py index 1be81dec..455480f7 100644 --- a/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py39.py +++ b/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py39.py @@ -52,16 +52,16 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero2_data["name"], "The name should not be set to none" - assert ( - data["secret_name"] == "Spider-Youngster" - ), "The secret name should be updated" + assert data["secret_name"] == "Spider-Youngster", ( + "The secret name should be updated" + ) response = client.patch(f"/heroes/{hero3_id}", json={"age": None}) data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero3_data["name"] assert data["age"] is None, ( - "A field should be updatable to None, even if " "that's the default" + "A field should be updatable to None, even if that's the default" ) response = client.patch("/heroes/9001", json={"name": "Dragon Cube X"}) diff --git a/tests/test_tutorial/test_fastapi/test_update/test_tutorial002.py b/tests/test_tutorial/test_fastapi/test_update/test_tutorial002.py index 32e343ed..2a929f6d 100644 --- a/tests/test_tutorial/test_fastapi/test_update/test_tutorial002.py +++ b/tests/test_tutorial/test_fastapi/test_update/test_tutorial002.py @@ -80,9 +80,9 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero2_data["name"], "The name should not be set to none" - assert ( - data["secret_name"] == "Spider-Youngster" - ), "The secret name should be updated" + assert data["secret_name"] == "Spider-Youngster", ( + "The secret name should be updated" + ) assert "password" not in data assert "hashed_password" not in data with Session(mod.engine) as session: @@ -95,9 +95,9 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero3_data["name"] - assert ( - data["age"] is None - ), "A field should be updatable to None, even if that's the default" + assert data["age"] is None, ( + "A field should be updatable to None, even if that's the default" + ) assert "password" not in data assert "hashed_password" not in data with Session(mod.engine) as session: diff --git a/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py310.py b/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py310.py index b05f5b21..7617f149 100644 --- a/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py310.py +++ b/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py310.py @@ -83,9 +83,9 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero2_data["name"], "The name should not be set to none" - assert ( - data["secret_name"] == "Spider-Youngster" - ), "The secret name should be updated" + assert data["secret_name"] == "Spider-Youngster", ( + "The secret name should be updated" + ) assert "password" not in data assert "hashed_password" not in data with Session(mod.engine) as session: @@ -98,9 +98,9 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero3_data["name"] - assert ( - data["age"] is None - ), "A field should be updatable to None, even if that's the default" + assert data["age"] is None, ( + "A field should be updatable to None, even if that's the default" + ) assert "password" not in data assert "hashed_password" not in data with Session(mod.engine) as session: diff --git a/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py39.py b/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py39.py index 807e3342..dc788a29 100644 --- a/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py39.py +++ b/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py39.py @@ -83,9 +83,9 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero2_data["name"], "The name should not be set to none" - assert ( - data["secret_name"] == "Spider-Youngster" - ), "The secret name should be updated" + assert data["secret_name"] == "Spider-Youngster", ( + "The secret name should be updated" + ) assert "password" not in data assert "hashed_password" not in data with Session(mod.engine) as session: @@ -98,9 +98,9 @@ def test_tutorial(clear_sqlmodel): data = response.json() assert response.status_code == 200, response.text assert data["name"] == hero3_data["name"] - assert ( - data["age"] is None - ), "A field should be updatable to None, even if that's the default" + assert data["age"] is None, ( + "A field should be updatable to None, even if that's the default" + ) assert "password" not in data assert "hashed_password" not in data with Session(mod.engine) as session: -- 2.47.2