Pre commit lint and format update (#250)

* Update pre-commit and CI to ensure format and lint (#248)

* Adding the changes we made in precommit, poetry, nox

* add release.md

* Update pre-commit to all files and Mypy setup (#247)

* Update pre-commit and mypy .ini just like the main strawberry project

* add a lint error on purpose to test lint

* add a release md and add file attr to tmol pre-commit

* fix test action to run when a PR is ready for review

* test mappe

* fix action

* continue with tests in lint in nox file

* remove pydantic.mypy plugin

* made first lint ajustment, but still missing lint test

* add ruff and black to lint te

* Fix nox file and add ruff to pyptoject toml

* fix poetry lock

* fix command to raise error

* make ruff output errors

* bring back black to pre-commit

* remove --diff from ruff because we want to run in all files, remove invalid rules in lint

* update pre-commit to ruff run lint and formatter

* separate ruff lint from formater in noxfile

* remove test function from mapper

* remove black and use only ruff

* add lint tag to ruff format in nox

* change test.yml to run lint and format divided

* Run pre-commit in all files and made line-lenght 100

* updated ruff check

* update pyproject.toml

* Made sourcery fixes

* remove unecessary else

* bring back session._session

Author: Ckk3

.alexrc

@@ -1,6 +1,5 @@
 {
   "allow": [
-    "black",
     "hook",
     "hooks",
     "failure",

.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"
       ]

.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"

.github/pyproject.toml

@@ -1,5 +1,3 @@
 [tool.ruff]
 extend = "../pyproject.toml"
-extend-ignore = [
-    "T201",
-]
+lint.extend-ignore = ["T201"]

.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

.gitignore

@@ -49,5 +49,6 @@ cover/*
 MANIFEST
 
 # Per-project virtualenvs
+venv*/
 .venv*/
 .conda*/

.isort.cfg

@@ -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)$

.pre-commit-config.yaml

@@ -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/)
-
-

CHANGELOG.md

@@ -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