Upgrade pre-commit configuration and move to ruff (#2057)

Author: Pierre-Sassoulas

.pre-commit-config.yaml

@@ -9,17 +9,12 @@ repos:
         exclude: .github/|tests/testdata
       - id: end-of-file-fixer
         exclude: tests/testdata
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.0.2
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: "v0.0.255"
     hooks:
-      - id: autoflake
-        exclude: tests/testdata|astroid/__init__.py|astroid/scoped_nodes.py|astroid/node_classes.py
-        args:
-          - --in-place
-          - --remove-all-unused-imports
-          - --expand-star-imports
-          - --remove-duplicate-keys
-          - --remove-unused-variables
+      - id: ruff
+        exclude: tests/testdata
+        args: ["--fix"]
   - repo: https://github.com/Pierre-Sassoulas/copyright_notice_precommit
     rev: 0.1.2
     hooks:
@@ -33,11 +28,6 @@ repos:
       - id: pyupgrade
         exclude: tests/testdata
         args: [--py37-plus]
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        exclude: tests/testdata
   - repo: https://github.com/Pierre-Sassoulas/black-disable-checker/
     rev: v1.1.3
     hooks:
@@ -49,13 +39,6 @@ repos:
       - id: black
         args: [--safe, --quiet]
         exclude: tests/testdata
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          [flake8-bugbear==23.2.13, flake8-typing-imports==1.14.0]
-        exclude: tests/testdata|doc/conf.py
   - repo: local
     hooks:
       - id: pylint

astroid/brain/brain_dataclasses.py

@@ -360,7 +360,7 @@ def _generate_dataclass_init(  # pylint: disable=too-many-locals
             if name in prev_pos_only_store:
                 prev_pos_only_store[name] = (ann_str, default_str)
             elif name in prev_kw_only_store:
-                params = [name] + params
+                params = [name, *params]
                 prev_kw_only_store.pop(name)
             else:
                 params.append(param_str)

astroid/brain/brain_namedtuple_enum.py

@@ -284,7 +284,7 @@ def _check_namedtuple_attributes(typename, attributes, rename=False):
 
     # The following snippet is derived from the CPython Lib/collections/__init__.py sources
     # <snippet>
-    for name in (typename,) + attributes:
+    for name in (typename, *attributes):
         if not isinstance(name, str):
             raise AstroidTypeError("Type names and field names must be strings")
         if not name.isidentifier():

astroid/interpreter/_import/spec.py

@@ -230,7 +230,7 @@ def find_module(
         submodule_path: Sequence[str] | None,
     ) -> ModuleSpec | None:
         if processed:
-            modname = ".".join(processed + [modname])
+            modname = ".".join([*processed, modname])
         if util.is_namespace(modname) and modname in sys.modules:
             submodule_path = sys.modules[modname].__path__
             return ModuleSpec(

astroid/modutils.py

@@ -672,7 +672,7 @@ def _has_init(directory: str) -> str | None:
     else return None.
     """
     mod_or_pack = os.path.join(directory, "__init__")
-    for ext in PY_SOURCE_EXTS + ("pyc", "pyo"):
+    for ext in (*PY_SOURCE_EXTS, "pyc", "pyo"):
         if os.path.exists(mod_or_pack + "." + ext):
             return mod_or_pack + "." + ext
     return None

astroid/nodes/node_classes.py

@@ -1273,7 +1273,7 @@ def get_children(self):
 
     @cached_property
     def _assign_nodes_in_scope(self) -> list[nodes.Assign]:
-        return [self] + self.value._assign_nodes_in_scope
+        return [self, *self.value._assign_nodes_in_scope]
 
     def _get_yield_nodes_skip_lambdas(self):
         yield from self.value._get_yield_nodes_skip_lambdas()

astroid/nodes/scoped_nodes/scoped_nodes.py

@@ -19,9 +19,8 @@
 from functools import lru_cache
 from typing import TYPE_CHECKING, ClassVar, NoReturn, TypeVar, overload
 
-from astroid import bases
+from astroid import bases, util
 from astroid import decorators as decorators_mod
-from astroid import util
 from astroid.const import IS_PYPY, PY38, PY38_PLUS, PY39_PLUS, PYPY_7_3_11_PLUS
 from astroid.context import (
     CallContext,
@@ -2927,7 +2926,7 @@ def _slots(self):
             if exc.args and exc.args[0] not in ("", None):
                 return exc.args[0]
             return None
-        return [first] + list(slots)
+        return [first, *slots]
 
     # Cached, because inferring them all the time is expensive
     @decorators_mod.cached
@@ -3033,7 +3032,7 @@ def _compute_mro(self, context: InferenceContext | None = None):
                 ancestors = list(base.ancestors(context=context))
                 bases_mro.append(ancestors)
 
-        unmerged_mro = [[self]] + bases_mro + [inferred_bases]
+        unmerged_mro = [[self], *bases_mro, inferred_bases]
         unmerged_mro = list(clean_duplicates_mro(unmerged_mro, self, context))
         clean_typing_generic_mro(unmerged_mro)
         return _c3_merge(unmerged_mro, self, context)

doc/conf.py

@@ -62,7 +62,7 @@
 # built documents.
 #
 # The short X.Y version.
-from astroid.__pkginfo__ import __version__
+from astroid.__pkginfo__ import __version__  # noqa
 
 # The full version, including alpha/beta/rc tags.
 release = __version__

pyproject.toml

@@ -65,14 +65,6 @@ python_files = ["*test_*.py"]
 testpaths = ["tests"]
 filterwarnings = "error"
 
-[tool.isort]
-include_trailing_comma = true
-known_first_party = ["astroid"]
-known_third_party = ["attr", "nose", "numpy", "pytest", "six", "sphinx"]
-line_length = 88
-multi_line_output = 3
-skip_glob = ["tests/testdata"]
-
 [tool.mypy]
 enable_error_code = "ignore-without-code"
 no_implicit_optional = true
@@ -94,3 +86,36 @@ module = [
     "wrapt.*",
 ]
 ignore_missing_imports = true
+
+
+[tool.ruff]
+
+# ruff is less lenient than pylint and does not make any exceptions
+# (for docstrings, strings and comments in particular).
+line-length = 110
+
+select = [
+    "E",  # pycodestyle
+    "F",  # pyflakes
+    "W",  # pycodestyle
+    "B",  # bugbear
+    "I",  # isort
+    "RUF", # ruff
+]
+
+ignore = [
+    "B905", # `zip()` without an explicit `strict=` parameter
+    "F401",  # API
+    "RUF100", # ruff does not understand pylint's directive usefulness
+]
+
+fixable = [
+    "E",  # pycodestyle
+    "F",  # pyflakes
+    "W",  # pycodestyle
+    "B",  # bugbear
+    "I",  # isort
+    "RUF", # ruff
+]
+unfixable = []
+target-version = "py37"

requirements_test_pre_commit.txt

@@ -1,9 +1,6 @@
 -r requirements_test_min.txt
-black==23.1.0
-pylint==2.17.0
-isort==5.12.0;python_version>='3.8'
-flake8==6.0.0;python_version>='3.8'
-flake8-typing-imports==1.14.0;python_version>='3.8'
-flake8-bugbear==23.2.13;python_version>='3.8'
-mypy==1.1.1
-pre-commit~=2.21
+black
+pylint
+mypy
+ruff
+pre-commit

setup.cfg

@@ -7,18 +7,3 @@
 license_files =
     LICENSE
     CONTRIBUTORS.txt
-
-[flake8]
-# F401; Unused imports
-# E203; Incompatible with black see https://github.com/psf/black/issues/315
-# W503; Incompatible with black
-# B901; Combine yield and return statements in one function
-# B905; We still support python 3.9
-# B906; Flake8 plugin specific check that is always going to be a false positive in pylint
-# B907; Not worth a refactor
-extend-ignore = F401, E203, W503, B901, B905, B906, B907
-max-line-length = 110
-select = B,C,E,F,W,T4,B9
-# Required for flake8-typing-imports (v1.12.0)
-# The plugin doesn't yet read the value from pyproject.toml
-min_python_version = 3.7.2

tests/test_inference.py

@@ -17,9 +17,8 @@
 
 import pytest
 
-from astroid import Slice, arguments
+from astroid import Slice, arguments, helpers, nodes, objects, test_utils, util
 from astroid import decorators as decoratorsmod
-from astroid import helpers, nodes, objects, test_utils, util
 from astroid.arguments import CallSite
 from astroid.bases import BoundMethod, Instance, UnboundMethod, UnionType
 from astroid.builder import AstroidBuilder, _extract_single_node, extract_node, parse

tests/test_nodes.py

@@ -998,7 +998,7 @@ def parse_transform(self, code: str) -> Module:
 
     def test_aliases(self) -> None:
         def test_from(node: ImportFrom) -> ImportFrom:
-            node.names = node.names + [("absolute_import", None)]
+            node.names = [*node.names, ("absolute_import", None)]
             return node
 
         def test_class(node: ClassDef) -> ClassDef:

tests/test_regrtest.py

@@ -267,7 +267,7 @@ def method(self):
                 "With unicode : {'’'} "
 
         instance = MyClass()
-        """
+        """  # noqa[RUF001]
         )
 
         next(node.value.infer()).as_string()