Merge pull request #878 from scop/chore/ruff

test(python): switch linting to Ruff

Author: scop

.github/renovate.json

@@ -39,25 +39,20 @@
       "versioning": "pep440",
       "groupName": "black"
     },
-    {
-      "matchPackagePatterns": ["(^|/)flake8$"],
-      "versioning": "pep440",
-      "groupName": "flake8"
-    },
     {
       "matchPackagePatterns": ["(^|/)gitlint$"],
       "versioning": "pep440",
       "groupName": "gitlint"
     },
-    {
-      "matchPackagePatterns": ["(^|/)isort$"],
-      "versioning": "pep440",
-      "groupName": "isort"
-    },
     {
       "matchPackageNames": ["perltidy/perltidy"],
       "versioning": "regex:^(?<major>\\d{8})$"
     },
+    {
+      "matchPackagePatterns": ["(^|/)ruff(-pre-commit)?$"],
+      "groupName": "ruff",
+      "versioning": "pep440"
+    },
     {
       "matchPackageNames": [
         "scop/pre-commit-shfmt",

.pre-commit-config.yaml

@@ -41,38 +41,22 @@ repos:
         files: ^completions/_
         pass_filenames: false
 
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.247
     hooks:
-      - id: black
+      - id: ruff
         types: [text]
         files: ^(helpers/python|.+\.py)$
         exclude: ^completions/
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://github.com/psf/black
+    rev: 23.1.0
     hooks:
-      - id: flake8
-        args: [--config=test/setup.cfg]
-        additional_dependencies:
-          # Splitting dashes and items on separate lines is intentional,
-          # enables Renovate's pip_requirements manager to update this file.
-          -
-            pycodestyle ==2.10.0
-          -
-            pyflakes ==3.0.1
-          -
-            flake8-bugbear ==23.1.14
+      - id: black
         types: [text]
         files: ^(helpers/python|.+\.py)$
         exclude: ^completions/
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        args: [--filter-files, --settings-path=test/setup.cfg]
-
   - repo: local
     hooks:
       - id: mypy
@@ -87,13 +71,6 @@ repos:
         # Intentionally not run on helpers/python (we support very old versions)
         exclude: ^completions/|^test/fixtures/pytest/
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
-    hooks:
-      - id: pyupgrade
-        args: [--py36-plus, --keep-percent-format]
-        exclude: ^completions/
-
   - repo: https://github.com/perltidy/perltidy
     rev: "20210717"
     hooks:

doc/testing.md

@@ -13,7 +13,7 @@ and [pexpect](https://pexpect.readthedocs.io/).
 
 For the Python part, all of it is formatted using
 [Black](https://github.com/psf/black), and we also run
-[Flake8](https://flake8.pycqa.org/) on it.
+[Ruff](https://github.com/charliermarsh/ruff) on it.
 
 ## Installing dependencies
 

helpers/python

@@ -11,4 +11,4 @@ else:
     walker = pkgutil.iter_modules
 
 for mod in walker():
-    print(mod[1])  # noqa: E211
+    print(mod[1])

pyproject.toml

@@ -1,3 +1,18 @@
 [tool.black]
 line-length = 79
 target-version = ["py36", "py37", "py38", "py39", "py310"]
+
+[tool.ruff]
+line-length = 79
+target-version = "py37"
+select = ["E", "F", "B"]
+ignore = [
+    "E50", # Black
+    "E70", # Black
+
+]
+fix = true
+
+[tool.ruff.isort]
+known-first-party = ["conftest"]
+known-third-party = ["pexpect", "pytest"]

test/requirements-dev.txt

@@ -4,13 +4,8 @@
 
 black ==23.1.0
 
-flake8 ==6.0.0
-pycodestyle ==2.10.0
-pyflakes ==3.0.1
-flake8-bugbear ==23.1.14
-
-isort ==5.12.0
-
 mypy ==0.971
 
 pre-commit >=2.4.0
+
+ruff ==0.0.247

test/setup.cfg

@@ -9,12 +9,3 @@ python_version = 3.6
 mypy_path = $MYPY_CONFIG_FILE_DIR/t
 show_error_codes = true
 enable_error_code = ignore-without-code
-
-[isort]
-known_first_party = conftest
-known_third_party = pexpect,pytest
-profile = black
-line_length = 79
-
-[flake8]
-extend-ignore = D202,E203,E501