strawberry-graphql · Ckk3 · May 24, 2025 · May 15, 2025 · May 15, 2025 · May 15, 2025
diff --git a/.alexrc b/.alexrc
@@ -1,6 +1,5 @@
 {
   "allow": [
-    "black",
     "hook",
     "hooks",
     "failure",

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -13,20 +13,19 @@
         "python.linting.enabled": true,
         "python.linting.pylintEnabled": false,
         "python.linting.mypyEnabled": true,
+        "python.linting.mypyPath": "${workspaceFolder}/.venv/bin/mypy",
         "[python]": {
           "editor.defaultFormatter": "charliermarsh.ruff"
         },
-        "python.formatting.provider": "black",
-        "python.formatting.blackPath": "${workspaceFolder}/.venv/bin/black",
-        "python.linting.mypyPath": "${workspaceFolder}/.venv/bin/mypy"
+        "python.formatting.provider": "none"
       },
       "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",
         "ms-azuretools.vscode-docker",
         "eamodio.gitlens",
         "charliermarsh.ruff",
-        // Dont install these extensions because they conflict with black lint
+        // Dont install these extensions because they conflict with lint
         "-dbaeumer.vscode-eslint",
         "-ms-python.autopep8"
       ]

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,7 +9,7 @@ updates:
     all-dependencies:
       patterns:
         - "*"
-      # Strawberry is an internal dependency, 
+      # Strawberry is an internal dependency,
       # let's keep an additional eye on this
       exclude-patterns:
         - "strawberry-graphql"

diff --git a/.github/pyproject.toml b/.github/pyproject.toml
@@ -1,5 +1,3 @@
 [tool.ruff]
 extend = "../pyproject.toml"
-extend-ignore = [
-    "T201",
-]
+lint.extend-ignore = ["T201"]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,9 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    types: [synchronize, reopened, opened, ready_for_review]
+    branches:
+    - main
     paths:
       - "src/strawberry-sqlalchemy-mapper/**"
       - "tests/**"
@@ -29,7 +31,7 @@ jobs:
       - id: set-matrix
         shell: bash
         run: |
-          . .venv/bin/activate 
+          . .venv/bin/activate
           pip install poetry nox nox-poetry
           echo sessions=$(
             nox --json -t tests -l |
@@ -103,7 +105,7 @@ jobs:
           run: poetry run pytest tests/benchmarks --codspeed
 
   lint:
-    name: ✨ Lint
+    name: ✨ Lint and Format
     runs-on: ubuntu-latest
 
     steps:
@@ -132,7 +134,9 @@ jobs:
             ${{ runner.os }}-nox-lint-${{ env.pythonLocation }}
 
       - run: pip install poetry nox nox-poetry uv
+      - run: mkdir .mypy_cache
       - run: nox -r -t lint
+      - run: nox -r -t format
 
   unit-tests-on-windows:
     name: 🪟 Tests on Windows

diff --git a/.gitignore b/.gitignore
@@ -49,5 +49,6 @@ cover/*
 MANIFEST
 
 # Per-project virtualenvs
+venv*/
 .venv*/
 .conda*/
diff --git a/.isort.cfg b/.isort.cfg
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,13 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 24.4.0
-    hooks:
-      - id: black
-        exclude: ^tests/\w+/snapshots/
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.7
+    # Ruff version.
+    rev: v0.11.10
     hooks:
-      - id: ruff
-        exclude: ^tests/\w+/snapshots/
+      # Run the linter.
+      - id: ruff-check
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format
 
   - repo: https://github.com/patrick91/pre-commit-alex
     rev: aa5da9e54b92ab7284feddeaf52edf14b1690de3
@@ -37,3 +35,9 @@ repos:
     hooks:
       - id: blacken-docs
         args: [--skip-errors]
+
+  - repo: https://github.com/ComPWA/taplo-pre-commit
+    rev: v0.9.3
+    hooks:
+      - id: taplo-format
+        files: \.(toml)$
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -152,5 +152,3 @@ Contributed by [Layton Wedgeworth](https://github.com/asimov-layton) via [PR #24
 Dependency version changes needed for python 3.12 compatibility.
 
 Contributed by [mattalbr](https://github.com/mattalbr) via [PR #35](https://github.com/strawberry-graphql/strawberry-sqlalchemy/pull/35/)
-
-
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -353,7 +353,6 @@ on PyPI_, the following steps can be used to release a new version for
 .. |tox| replace:: ``tox``
 
 
-.. _black: https://pypi.org/project/black/
 .. _CommonMark: https://commonmark.org/
 .. _contribution-guide.org: https://www.contribution-guide.org/
 .. _creating a PR: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request

diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,10 @@
+Release type: patch
+
+This release does not introduce any new features or bug fixes. It focuses solely on internal code quality improvements.
+
+Changes:
+- Added Mypy configuration aligned with the main Strawberry project.
+- Enforced type checking via CI to ensure consistency.
+- Ran pre-commit across all files to standardize formatting and follow the project's linting architecture.
+
+These changes aim to improve maintainability and ensure better development practices moving forward.
diff --git a/docs/conf.py b/docs/conf.py
@@ -8,8 +8,9 @@
 # serve to show the default.
 
 import os
-import sys
 import shutil
+import sys
+from contextlib import suppress
 
 # -- Path setup --------------------------------------------------------------
 
@@ -35,10 +36,9 @@
 
 output_dir = os.path.join(__location__, "api")
 module_dir = os.path.join(__location__, "../src/strawberry_sqlalchemy_mapper")
-try:
+
+with suppress(FileNotFoundError):
     shutil.rmtree(output_dir)
-except FileNotFoundError:
-    pass
 
 try:
     import sphinx
@@ -52,7 +52,7 @@
 
     apidoc.main(args)
 except Exception as e:
-    print("Running `sphinx-apidoc` failed!\n{}".format(e))
+    print(f"Running `sphinx-apidoc` failed!\n{e}")  # noqa: T201
 
 # -- General configuration ---------------------------------------------------
 
@@ -96,7 +96,7 @@
 #
 # version: The short X.Y version.
 # release: The full version, including alpha/beta/rc tags.
-# If you don’t need the separation provided between version and release,
+# If you don't need the separation provided between version and release,
 # just set them both to the same value.
 try:
     from strawberry_sqlalchemy_mapper import __version__ as version
@@ -158,10 +158,7 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-    "sidebar_width": "300px",
-    "page_width": "1200px"
-}
+html_theme_options = {"sidebar_width": "300px", "page_width": "1200px"}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
@@ -246,7 +243,13 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "user_guide.tex", "strawberry-sqlalchemy-mapper Documentation", "Tim Dumol", "manual")
+    (
+        "index",
+        "user_guide.tex",
+        "strawberry-sqlalchemy-mapper Documentation",
+        "Tim Dumol",
+        "manual",
+    )
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -283,4 +286,4 @@
     "pyscaffold": ("https://pyscaffold.org/en/stable", None),
 }
 
-print(f"loading configurations for {project} {version} ...", file=sys.stderr)
+print(f"loading configurations for {project} {version} ...", file=sys.stderr)  # noqa: T201
diff --git a/noxfile.py b/noxfile.py
@@ -18,6 +18,10 @@
 ]
 
 
+def poetry_install_run_always(session: Session) -> None:
+    session.run_always("poetry", "install", external=True)
+
+
 @session(python=PYTHON_VERSIONS, name="SQLAlchemy 2.0 Tests", tags=["tests"])
 def tests_sqlalchemy_latest(session: Session) -> None:
     session.run_always(
@@ -31,7 +35,7 @@ def tests_sqlalchemy_latest(session: Session) -> None:
         "wheel",
         external=True,
     )
-    session.run_always("poetry", "install", external=True)
+    poetry_install_run_always(session)
 
     session.run(
         "pytest",
@@ -53,7 +57,7 @@ def tests_sqlalchemy_1_4(session: Session) -> None:
         "wheel",
         external=True,
     )
-    session.run_always("poetry", "install", external=True)
+    poetry_install_run_always(session)
     session._session.install("sqlalchemy~=1.4")
 
     session.run(
@@ -64,6 +68,40 @@ def tests_sqlalchemy_1_4(session: Session) -> None:
 
 @session(name="Mypy", tags=["lint"])
 def mypy(session: Session) -> None:
-    session.run_always("poetry", "install", external=True)
+    poetry_install_run_always(session)
+
+    session.run(
+        "mypy",
+        "--install-types",
+        "--non-interactive",
+        "--cache-dir=.mypy_cache/",
+        "--config-file",
+        "mypy.ini",
+    )
 
-    session.run("mypy", "--config-file", "mypy.ini")
+
+@session(name="Ruff Lint", tags=["lint"])
+def ruff_lint(session: Session) -> None:
+    poetry_install_run_always(session)
+
+    session.run(
+        "ruff",
+        "check",
+        "--no-fix",
+        ".",
+        silent=False,
+    )
+
+
+@session(name="Ruff Format", tags=["format"])
+def ruff_format(session: Session) -> None:
+    poetry_install_run_always(session)
+
+    session.run(
+        "ruff",
+        "format",
+        "--check",
+        "--diff",
+        ".",
+        silent=False,
+    )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -152,5 +152,3 @@ Contributed by [Layton Wedgeworth](https://github.com/asimov-layton) via [PR #24
		Dependency version changes needed for python 3.12 compatibility.

		Contributed by [mattalbr](https://github.com/mattalbr) via [PR #35](https://github.com/strawberry-graphql/strawberry-sqlalchemy/pull/35/)