Migrate flake8 to ruff

Secrus · radoering · commit 2065a4f8e793 · 2023-04-25T06:32:07.000+02:00
diff --git a/.flake8 b/.flake8
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -32,24 +32,6 @@ repos:
       - id: python-use-type-annotations
       - id: python-check-blanket-noqa
 
-  - repo: https://github.com/asottile/yesqa
-    rev: v1.4.0
-    hooks:
-      - id: yesqa
-        additional_dependencies: &flake8_deps
-          - flake8-annotations==3.0.0
-          - flake8-broken-line==0.6.0
-          - flake8-bugbear==23.2.13
-          - flake8-comprehensions==3.10.1
-          - flake8-eradicate==1.4.0
-          - flake8-quotes==3.3.2
-          - flake8-simplify==0.19.3
-          - flake8-tidy-imports==4.8.0
-          - flake8-type-checking==2.3.0
-          - flake8-typing-imports==1.14.0
-          - flake8-use-fstring==1.4
-          - pep8-naming==0.13.3
-
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.1
     hooks:
@@ -79,8 +61,7 @@ repos:
     hooks:
       - id: black
 
-  - repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.262
     hooks:
-      - id: flake8
-        additional_dependencies: *flake8_deps
+    -   id: ruff
diff --git a/pyproject.toml b/pyproject.toml
@@ -56,6 +56,40 @@ tomli-w = "^1.0.0"
 types-jsonschema = ">=4.4.4"
 types-setuptools = ">=57.4.14"
 
+
+[tool.ruff]
+fix = true
+unfixable = [
+    "ERA",  # do not autoremove commented out code
+]
+target-version = "py37"
+line-length = 88
+extend-select = [
+    "B",  # flake8-bugbear
+    "C4",  # flake8-comprehensions
+    "ERA",  # flake8-eradicate/eradicate
+    "PIE",  # flake8-pie
+    "SIM",  # flake8-simplify
+    "TID",  # flake8-tidy-imports
+    "TCH",  # flake8-type-checking
+    "N",  # pep8-naming
+    "RUF",  # ruff checks
+]
+ignore = [
+    "B904",  # use 'raise ... from err'
+    "B905",  # use explicit 'strict=' parameter with 'zip()'
+    "N818"  #  Exception name should be named with an Error suffix
+]
+extend-exclude = [
+    "src/poetry/core/_vendor/*",
+    "tests/fixtures/*",
+    "tests/**/fixtures/*"
+]
+
+[tool.ruff.flake8-tidy-imports]
+ban-relative-imports = "all"
+
+
 [tool.black]
 line-length = 88
 preview = true
diff --git a/src/poetry/core/constraints/version/version_range.py b/src/poetry/core/constraints/version/version_range.py
@@ -328,7 +328,7 @@ def difference(self, other: VersionConstraint) -> VersionConstraint:
             if not ranges:
                 return current
 
-            return VersionUnion.of(*(ranges + [current]))
+            return VersionUnion.of(*([*ranges, current]))
 
         raise ValueError(f"Unknown VersionConstraint type {other}.")
 
diff --git a/src/poetry/core/json/__init__.py b/src/poetry/core/json/__init__.py
@@ -25,7 +25,7 @@ def validate_object(obj: dict[str, Any], schema_name: str) -> list[str]:
     from jsonschema import Draft7Validator
 
     validator = Draft7Validator(schema)
-    validation_errors = sorted(validator.iter_errors(obj), key=lambda e: e.path)  # type: ignore[no-any-return]
+    validation_errors = sorted(validator.iter_errors(obj), key=lambda e: e.path)  # type: ignore[no-any-return] # noqa: E501
 
     errors = []
 
diff --git a/src/poetry/core/masonry/api.py b/src/poetry/core/masonry/api.py
@@ -23,8 +23,9 @@ def get_requires_for_build_wheel(
     Returns an additional list of requirements for building, as PEP508 strings,
     above and beyond those specified in the pyproject.toml file.
 
-    This implementation is optional. At the moment it only returns an empty list, which would be the same as if
-    not define. So this is just for completeness for future implementation.
+    This implementation is optional. At the moment it only returns an empty list,
+    which would be the same as if not define. So this is just for completeness
+    for future implementation.
     """
 
     return []
diff --git a/src/poetry/core/masonry/builders/builder.py b/src/poetry/core/masonry/builders/builder.py
@@ -14,7 +14,9 @@
     from poetry.core.poetry import Poetry
 
 
-AUTHOR_REGEX = re.compile(r"(?u)^(?P<name>[- .,\w\d'’\"()]+) <(?P<email>.+?)>$")
+AUTHOR_REGEX = re.compile(
+    r"(?u)^(?P<name>[- .,\w\d'’\"()]+) <(?P<email>.+?)>$"  # noqa: RUF001
+)
 
 METADATA_BASE = """\
 Metadata-Version: 2.1
diff --git a/src/poetry/core/masonry/builders/sdist.py b/src/poetry/core/masonry/builders/sdist.py
@@ -289,7 +289,7 @@ def find_nearest_pkg(rel_path: str) -> tuple[str, str]:
             if is_subpkg:
                 subpkg_paths.add(from_top_level)
                 parts = from_top_level.split(os.sep)
-                packages.append(".".join([pkg_name] + parts))
+                packages.append(".".join([pkg_name, *parts]))
             else:
                 pkg, from_nearest_pkg = find_nearest_pkg(from_top_level)
 
diff --git a/src/poetry/core/masonry/utils/helpers.py b/src/poetry/core/masonry/utils/helpers.py
@@ -48,7 +48,8 @@ def escape_version(version: str) -> str:
 def escape_name(name: str) -> str:
     """
     Escaped wheel name as specified in https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode.
-    This function should only be used for the generation of artifact names, and not to normalize or filter existing artifact names.
+    This function should only be used for the generation of artifact names,
+    and not to normalize or filter existing artifact names.
     """
     warnings.warn(
         (
diff --git a/src/poetry/core/packages/package.py b/src/poetry/core/packages/package.py
@@ -34,7 +34,9 @@
 
     T = TypeVar("T", bound="Package")
 
-AUTHOR_REGEX = re.compile(r"(?u)^(?P<name>[- .,\w\d'’\"():&]+)(?: <(?P<email>.+?)>)?$")
+AUTHOR_REGEX = re.compile(
+    r"(?u)^(?P<name>[- .,\w\d'’\"():&]+)(?: <(?P<email>.+?)>)?$"  # noqa: RUF001
+)
 
 
 class Package(PackageSpecification):
diff --git a/src/poetry/core/vcs/git.py b/src/poetry/core/vcs/git.py
@@ -366,11 +366,12 @@ def run(self, *args: Any, **kwargs: Any) -> str:
                 (folder / ".git").as_posix(),
                 "--work-tree",
                 folder.as_posix(),
-            ) + args
+                *args,
+            )
 
         return (
             subprocess.check_output(
-                [executable()] + list(args), stderr=subprocess.STDOUT
+                [executable(), *list(args)], stderr=subprocess.STDOUT
             )
             .decode()
             .strip()
diff --git a/src/poetry/core/version/pep440/version.py b/src/poetry/core/version/pep440/version.py
@@ -309,9 +309,9 @@ def replace(self: T, **kwargs: Any) -> T:
             **{
                 **{
                     k: getattr(self, k)
-                    for k in self.__dataclass_fields__.keys()
+                    for k in self.__dataclass_fields__
                     if k not in ("_compare_key", "text")
-                },  # setup defaults with current values, excluding compare keys and text
+                },  # setup defaults with current values, excluding compare keys and text  # noqa: E501
                 **kwargs,  # keys to replace
             }
         )
diff --git a/tests/integration/test_pep517_backend.py b/tests/integration/test_pep517_backend.py
@@ -23,7 +23,8 @@ def test_pip_install(
     temporary_directory: Path, project_source_root: Path, python: str
 ) -> None:
     """
-    Ensure that a project using the repository version of poetry-core as a PEP 517 backend can be built.
+    Ensure that a project using the repository version of poetry-core as
+    a PEP 517 backend can be built.
     """
     temp_pep_517_backend_path = temporary_directory / "pep_517_backend"
 
diff --git a/tests/masonry/builders/test_complete.py b/tests/masonry/builders/test_complete.py
@@ -118,27 +118,24 @@ def test_complete(no_vcs: bool) -> None:
     if sys.platform != "win32":
         assert (os.stat(str(whl)).st_mode & 0o777) == 0o644
 
-    expected_name_list = (
-        [
-            "my_package/__init__.py",
-            "my_package/data1/test.json",
-            "my_package/sub_pkg1/__init__.py",
-            "my_package/sub_pkg2/__init__.py",
-            "my_package/sub_pkg2/data2/data.json",
-            "my_package/sub_pkg3/foo.py",
-            "my_package-1.2.3.data/scripts/script.sh",
-        ]
-        + sorted(
+    expected_name_list = [
+        "my_package/__init__.py",
+        "my_package/data1/test.json",
+        "my_package/sub_pkg1/__init__.py",
+        "my_package/sub_pkg2/__init__.py",
+        "my_package/sub_pkg2/data2/data.json",
+        "my_package/sub_pkg3/foo.py",
+        "my_package-1.2.3.data/scripts/script.sh",
+        *sorted(
             [
                 "my_package-1.2.3.dist-info/entry_points.txt",
                 "my_package-1.2.3.dist-info/LICENSE",
                 "my_package-1.2.3.dist-info/METADATA",
                 "my_package-1.2.3.dist-info/WHEEL",
             ],
             key=lambda x: Path(x),
-        )
-        + ["my_package-1.2.3.dist-info/RECORD"]
-    )
+        ),
+    ] + ["my_package-1.2.3.dist-info/RECORD"]
 
     with zipfile.ZipFile(str(whl)) as zipf:
         assert zipf.namelist() == expected_name_list
diff --git a/tests/masonry/builders/test_sdist.py b/tests/masonry/builders/test_sdist.py
@@ -142,7 +142,7 @@ def test_make_setup() -> None:
     }
     assert ns["scripts"] == [str(Path("bin") / "script.sh")]
     assert ns["extras_require"] == {
-        'time:python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5"': [
+        'time:python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5"': [  # noqa: E501
             "pendulum>=1.4,<2.0"
         ]
     }
diff --git a/tests/masonry/test_api.py b/tests/masonry/test_api.py
@@ -191,7 +191,7 @@ def test_prepare_metadata_for_build_wheel() -> None:
 My Package
 ==========
 
-"""
+"""  # noqa: E501
     with temporary_directory() as tmp_dir, cwd(os.path.join(fixtures, "complete")):
         dirname = api.prepare_metadata_for_build_wheel(tmp_dir)
 
diff --git a/tests/packages/test_dependency.py b/tests/packages/test_dependency.py
@@ -251,7 +251,7 @@ def test_complete_name() -> None:
         # non-semver version test is ignored due to existing bug in wildcard
         # constraint parsing that ignores non-semver versions
         # TODO: re-enable for verification once fixed
-        # ("A", ">=1.8.0.0,!=2.0.0.*", None, "A (>=1.8.0.0,!=2.0.0.*)"),  # noqa: E800
+        # ("A", ">=1.8.0.0,!=2.0.0.*", None, "A (>=1.8.0.0,!=2.0.0.*)"),  # noqa: ERA001
     ],
 )
 def test_dependency_string_representation(
diff --git a/tests/packages/test_main.py b/tests/packages/test_main.py
@@ -286,7 +286,7 @@ def test_dependency_from_pep_508_with_python_full_version() -> None:
     )
 
 
-def test_dependency_from_pep_508_with_python_full_version_pep440_compatible_release_astrix() -> (
+def test_dependency_from_pep_508_with_python_full_version_pep440_compatible_release_astrix() -> (  # noqa: E501
     None
 ):
     name = 'pathlib2 ; python_version == "3.4.*" or python_version < "3"'
@@ -297,7 +297,7 @@ def test_dependency_from_pep_508_with_python_full_version_pep440_compatible_rele
     assert dep.python_versions == "==3.4.* || <3"
 
 
-def test_dependency_from_pep_508_with_python_full_version_pep440_compatible_release_tilde() -> (
+def test_dependency_from_pep_508_with_python_full_version_pep440_compatible_release_tilde() -> (  # noqa: E501
     None
 ):
     name = 'pathlib2 ; python_version ~= "3.4" or python_version < "3"'
@@ -308,7 +308,7 @@ def test_dependency_from_pep_508_with_python_full_version_pep440_compatible_rele
     assert dep.python_versions == "~=3.4 || <3"
 
 
-def test_dependency_from_pep_508_should_not_produce_empty_constraints_for_correct_markers() -> (
+def test_dependency_from_pep_508_should_not_produce_empty_constraints_for_correct_markers() -> (  # noqa: E501
     None
 ):
     name = (
diff --git a/tests/packages/test_package.py b/tests/packages/test_package.py
@@ -57,7 +57,7 @@ def test_package_authors_invalid() -> None:
 
     package.authors.insert(0, "<John Doe")
     with pytest.raises(ValueError) as e:
-        package.author_name
+        package.author_name  # noqa: B018
 
     assert (
         str(e.value)
@@ -73,7 +73,7 @@ def test_package_authors_invalid() -> None:
         ("'Jane Doe'", None),
         ('"Jane Doe"', None),
         ("MyCompany", None),
-        ("Some Company’s", None),
+        ("Some Company’s", None),  # noqa: RUF001
         ("MyCompany's R&D", "rnd@MyCompanyName.MyTLD"),
         ("Doe, John", None),
         ("(Doe, John)", None),
@@ -88,10 +88,7 @@ def test_package_authors_invalid() -> None:
 def test_package_authors_valid(name: str, email: str | None) -> None:
     package = Package("foo", "0.1.0")
 
-    if email is None:
-        author = name
-    else:
-        author = f"{name} <{email}>"
+    author = name if email is None else f"{name} <{email}>"
     package.authors.insert(0, author)
     assert package.author_name == name
     assert package.author_email == email
@@ -114,7 +111,7 @@ def test_package_author_names_invalid(name: str) -> None:
 
     package.authors.insert(0, name)
     with pytest.raises(ValueError):
-        package.author_name
+        package.author_name  # noqa: B018
 
 
 @pytest.mark.parametrize("groups", [["main"], ["dev"]])
@@ -233,7 +230,7 @@ def test_package_equality_source_reference() -> None:
     assert a2 != a4
 
 
-def test_package_resolved_reference_is_relevant_for_equality_only_if_present_for_both_packages() -> (
+def test_package_resolved_reference_is_relevant_for_equality_only_if_present_for_both_packages() -> (  # noqa: E501
     None
 ):
     a1 = Package(
diff --git a/tests/testutils.py b/tests/testutils.py
@@ -30,14 +30,15 @@ def temporary_project_directory(
 ) -> Generator[str, None, None]:
     """
     Context manager that takes a project source directory, copies content to a temporary
-    directory, patches the `pyproject.toml` using the provided patch, or using the default
-    patch if one is not given. The default path replaces `build-system` section in order
-    to use the working copy of poetry-core as the backend.
+    directory, patches the `pyproject.toml` using the provided patch, or using the
+    default patch if one is not given. The default path replaces `build-system` section
+    in order to use the working copy of poetry-core as the backend.
 
     Once the context, exists, the temporary directory is cleaned up.
 
     :param path: Source project root directory to copy from.
-    :param toml_patch: Patch to use for the pyproject.toml, defaults to build system patching.
+    :param toml_patch: Patch to use for the pyproject.toml,
+                        defaults to build system patching.
     :return: A temporary copy
     """
     assert (path / "pyproject.toml").exists()
@@ -72,7 +73,7 @@ def validate_wheel_contents(
     with zipfile.ZipFile(path) as z:
         namelist = z.namelist()
         # we use concatenation here for PY2 compat
-        for filename in ["WHEEL", "METADATA", "RECORD"] + files:
+        for filename in ["WHEEL", "METADATA", "RECORD", *files]:
             assert f"{dist_info}/{filename}" in namelist
 
 
diff --git a/tests/utils/test_helpers.py b/tests/utils/test_helpers.py
@@ -41,7 +41,7 @@ def test_parse_requires() -> None:
 
 [dev]
 isort@ git+git://github.com/timothycrosley/isort.git@e63ae06ec7d70b06df9e528357650281a3d3ec22#egg=isort
-"""
+"""  # noqa: E501
     result = parse_requires(requires)
     expected = [
         "jsonschema>=2.6.0.0,<3.0.0.0",
diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py
