Switch formatter to Ruff (#106)

Author: drhagen

Diff for: .github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Store coverage
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-${{ matrix.python-version }}-${{ matrix.os }}
+          name: coverage-${{ matrix.python-version }}
           path: .coverage.*
   coverage:
     needs: test

Diff for: docs/contributing.md

@@ -28,29 +28,24 @@ poetry install
 Parsita uses pytest to run the tests in the `tests/` directory. The test command is encapsulated with Nox:
 
 ```shell
-poetry run nox -e test
+poetry run nox -s test
 ```
 
 This will try to test with all compatible Python versions that `nox` can find. To run the tests with only a particular version, run something like this:
 
 ```shell
-poetry run nox -e test-3.9
+poetry run nox -s test-3.9
 ```
 
-It is good to run the tests locally before making a PR, but it is not necessary to have all Python versions run. It is rare for a failure to appear in a single version, and the CI will catch it anyway. 
+It is good to run the tests locally before making a PR, but it is not necessary to have all Python versions run. It is rare for a failure to appear in a single version, and the CI will catch it anyway.
 
 ## Code quality
 
-Parsita uses Black and Ruff to ensure a minimum standard of code quality. The commands to check the code quality are encapsulated with Nox:
+Parsita uses Ruff to ensure a minimum standard of code quality. The code quality commands are encapsulated with Nox:
 
 ```shell
-poetry run nox -e lint
-```
-
-The commands to apply Black and the isort subset of Ruff are also encapsulated with Nox:
-
-```shell
-poetry run nox - fmt
+poetry run nox -s format
+poetry run nox -s lint
 ```
 
 ## Generating the docs

Diff for: noxfile.py

@@ -1,7 +1,9 @@
-import nox
+from __future__ import annotations
+
+from nox import options, parametrize
 from nox_poetry import Session, session
 
-nox.options.sessions = ["test", "coverage", "lint"]
+options.sessions = ["test", "coverage", "lint"]
 
 
 @session(python=["3.8", "3.9", "3.10", "3.11", "3.12"])
@@ -19,12 +21,12 @@ def coverage(s: Session):
 
 
 @session(venv_backend="none")
-def fmt(s: Session) -> None:
-    s.run("ruff", "check", ".", "--select", "I", "--fix")
-    s.run("black", ".")
+@parametrize("command", [["ruff", "check", "."], ["ruff", "format", "--check", "."]])
+def lint(s: Session, command: list[str]):
+    s.run(*command)
 
 
 @session(venv_backend="none")
-def lint(s: Session) -> None:
-    s.run("black", "--check", ".")
-    s.run("ruff", "check", ".")
+def format(s: Session) -> None:
+    s.run("ruff", "check", ".", "--select", "I", "--fix")
+    s.run("ruff", "format", ".")

Diff for: poetry.lock

@@ -29,8 +29,7 @@ pytest-cov = "*"
 pytest-timeout = "*"
 
 # Lint
-black = ">=22.10"
-ruff = ">=0.0.265"
+ruff = "^0.1"
 
 # Docs
 mkdocs-material = "^9"
@@ -60,10 +59,6 @@ source = [
 ]
 
 
-[tool.black]
-line-length = 99
-
-
 [tool.ruff]
 src = ["src"]
 line-length = 99

Diff for: pyproject.toml

@@ -87,7 +87,7 @@ def __prepare__(
         name,
         bases,
         *,
-        whitespace: Union[Parser[Input, Any], Pattern, str, None] = missing
+        whitespace: Union[Parser[Input, Any], Pattern, str, None] = missing,
     ):
         if whitespace is missing:
             whitespace = mcs.default_whitespace

Diff for: src/parsita/metaclasses.py

@@ -67,7 +67,7 @@ def lit(literal: Sequence[Input], *literals: Sequence[Input]) -> Parser[Input, I
 
         return LongestAlternativeParser(
             LiteralParser(literal, options.whitespace),
-            *(LiteralParser(literal_i, options.whitespace) for literal_i in literals)
+            *(LiteralParser(literal_i, options.whitespace) for literal_i in literals),
         )
     else:
         return LiteralParser(literal, options.whitespace)

Diff for: src/parsita/parsers/_literal.py

@@ -35,7 +35,7 @@ def __repr__(self):
 
 
 def rep1(
-    parser: Union[Parser[Input, Output], Sequence[Input]]
+    parser: Union[Parser[Input, Output], Sequence[Input]],
 ) -> RepeatedOnceParser[Input, Output]:
     """Match a parser one or more times repeatedly.