Enforce ruff/refurb rules (FURB)

pkg_resources/__init__.py

@@ -131,7 +131,9 @@ class _ZipLoaderModule(Protocol):
     __loader__: zipimport.zipimporter
 
 
-_PEP440_FALLBACK = re.compile(r"^v?(?P<safe>(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
+_PEP440_FALLBACK = re.compile(
+    r"^v?(?P<safe>(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.IGNORECASE
+)
 
 
 class PEP440Warning(RuntimeWarning):

ruff.toml

@@ -27,6 +27,7 @@ extend-select = [
 	# local
 	"ANN2", # missing-return-type-*
 	"ISC", # flake8-implicit-str-concat
+	"FURB", # refurb
 	"PERF", # Perflint
 	"PGH", # pygrep-hooks (blanket-* rules)
 	"PT", # flake8-pytest-style

setuptools/_normalization.py

@@ -9,10 +9,12 @@
 import packaging
 
 # https://packaging.python.org/en/latest/specifications/core-metadata/#name
-_VALID_NAME = re.compile(r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.I)
-_UNSAFE_NAME_CHARS = re.compile(r"[^A-Z0-9._-]+", re.I)
-_NON_ALPHANUMERIC = re.compile(r"[^A-Z0-9]+", re.I)
-_PEP440_FALLBACK = re.compile(r"^v?(?P<safe>(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
+_VALID_NAME = re.compile(r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.IGNORECASE)
+_UNSAFE_NAME_CHARS = re.compile(r"[^A-Z0-9._-]+", re.IGNORECASE)
+_NON_ALPHANUMERIC = re.compile(r"[^A-Z0-9]+", re.IGNORECASE)
+_PEP440_FALLBACK = re.compile(
+    r"^v?(?P<safe>(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.IGNORECASE
+)
 
 
 def safe_identifier(name: str) -> str:

setuptools/command/bdist_egg.py

@@ -37,8 +37,7 @@ def _get_purelib():
 def strip_module(filename):
     if '.' in filename:
         filename = os.path.splitext(filename)[0]
-    if filename.endswith('module'):
-        filename = filename[:-6]
+    filename = filename.removesuffix('module')
     return filename
 
 

setuptools/command/build_ext.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import itertools
+import operator
 import os
 import sys
 import textwrap
@@ -323,7 +324,7 @@ def get_outputs(self) -> list[str]:
     def get_output_mapping(self) -> dict[str, str]:
         """See :class:`setuptools.commands.build.SubCommand`"""
         mapping = self._get_output_mapping()
-        return dict(sorted(mapping, key=lambda x: x[0]))
+        return dict(sorted(mapping, key=operator.itemgetter(0)))
 
     def __get_stubs_outputs(self):
         # assemble the base name for each extension that needs a stub

setuptools/command/build_py.py

@@ -2,6 +2,7 @@
 
 import fnmatch
 import itertools
+import operator
 import os
 import stat
 import textwrap
@@ -149,7 +150,7 @@ def get_output_mapping(self) -> dict[str, str]:
             self._get_package_data_output_mapping(),
             self._get_module_mapping(),
         )
-        return dict(sorted(mapping, key=lambda x: x[0]))
+        return dict(sorted(mapping, key=operator.itemgetter(0)))
 
     def _get_module_mapping(self) -> Iterator[tuple[str, str]]:
         """Iterate over all modules producing (dest, src) pairs."""

setuptools/command/editable_wheel.py

@@ -14,6 +14,7 @@
 
 import io
 import logging
+import operator
 import os
 import shutil
 import traceback
@@ -665,7 +666,7 @@ def _parent_path(pkg, pkg_path):
     >>> _parent_path("b", "src/c")
     'src/c'
     """
-    parent = pkg_path[: -len(pkg)] if pkg_path.endswith(pkg) else pkg_path
+    parent = pkg_path.removesuffix(pkg)
     return parent.rstrip("/" + os.sep)
 
 
@@ -906,7 +907,7 @@ def _finder_template(
     """Create a string containing the code for the``MetaPathFinder`` and
     ``PathEntryFinder``.
     """
-    mapping = dict(sorted(mapping.items(), key=lambda p: p[0]))
+    mapping = dict(sorted(mapping.items(), key=operator.itemgetter(0)))
     return _FINDER_TEMPLATE.format(name=name, mapping=mapping, namespaces=namespaces)
 
 

setuptools/command/egg_info.py

@@ -477,8 +477,7 @@ def global_exclude(self, pattern):
         return self._remove_files(match.match)
 
     def append(self, item) -> None:
-        if item.endswith('\r'):  # Fix older sdists built on Windows
-            item = item[:-1]
+        item = item.removesuffix('\r')  # Fix older sdists built on Windows
         path = convert_path(item)
 
         if self._safe_path(path):

setuptools/dist.py

@@ -1068,8 +1068,7 @@ def iter_distribution_names(self) -> Iterator[str]:
                 name, _buildinfo = ext
             else:
                 name = ext.name
-            if name.endswith('module'):
-                name = name[:-6]
+            name = name.removesuffix('module')
             yield name
 
     def handle_display_options(self, option_order):

setuptools/msvc.py

@@ -402,7 +402,7 @@ def _find_latest_available_vs_ver(self):
 
         vc_vers = set(reg_vc_vers)
         vc_vers.update(self.known_vs_paths)
-        return sorted(vc_vers)[-1]
+        return max(vc_vers)
 
     def find_reg_vs_vers(self) -> list[float]:
         """

setuptools/tests/config/test_apply_pyprojecttoml.py

@@ -41,7 +41,9 @@ def _mock_expand_patterns(patterns, *_, **__):
     Allow comparing the given patterns for 2 dist objects.
     We need to strip special chars to avoid errors when validating.
     """
-    return [re.sub("[^a-z0-9]+", "", p, flags=re.I) or "empty" for p in patterns]
+    return [
+        re.sub("[^a-z0-9]+", "", p, flags=re.IGNORECASE) or "empty" for p in patterns
+    ]
 
 
 @pytest.mark.parametrize("url", urls_from_file(HERE / EXAMPLES_FILE))
@@ -600,7 +602,7 @@ def test_not_listed_in_dynamic(self, tmp_path, attr, field, value):
         """Setuptools cannot set a field if not listed in ``dynamic``"""
         pyproject = self.pyproject(tmp_path, [])
         dist = makedist(tmp_path, **{attr: value})
-        msg = re.compile(f"defined outside of `pyproject.toml`:.*{field}", re.S)
+        msg = re.compile(f"defined outside of `pyproject.toml`:.*{field}", re.DOTALL)
         with pytest.warns(_MissingDynamic, match=msg):
             dist = pyprojecttoml.apply_configuration(dist, pyproject)
 

setuptools/tests/config/test_pyprojecttoml.py

@@ -207,7 +207,7 @@ def test_scripts_not_listed_in_dynamic(self, tmp_path, missing_dynamic):
         dynamic = {"scripts", "gui-scripts", "entry-points"} - {missing_dynamic}
 
         msg = f"defined outside of `pyproject.toml`:.*{missing_dynamic}"
-        with pytest.raises(OptionError, match=re.compile(msg, re.S)):
+        with pytest.raises(OptionError, match=re.compile(msg, re.DOTALL)):
             expand_configuration(self.pyproject(dynamic), tmp_path)
 
 
@@ -325,7 +325,9 @@ def test_invalid_example(tmp_path, example, error_msg):
     pyproject = tmp_path / "pyproject.toml"
     pyproject.write_text(cleandoc(example), encoding="utf-8")
 
-    pattern = re.compile(f"invalid pyproject.toml.*{error_msg}.*", re.M | re.S)
+    pattern = re.compile(
+        f"invalid pyproject.toml.*{error_msg}.*", re.MULTILINE | re.DOTALL
+    )
     with pytest.raises(ValueError, match=pattern):
         read_configuration(pyproject)
 

setuptools/tests/test_dist_info.py

@@ -23,7 +23,7 @@ def test_invalid_version(self, tmp_path):
         """
         config = "[metadata]\nname=proj\nversion=42\n[egg_info]\ntag_build=invalid!!!\n"
         (tmp_path / "setup.cfg").write_text(config, encoding="utf-8")
-        msg = re.compile("invalid version", re.M | re.I)
+        msg = re.compile("invalid version", re.MULTILINE | re.IGNORECASE)
         proc = run_command_inner("dist_info", cwd=tmp_path, check=False)
         assert proc.returncode
         assert msg.search(proc.stdout)

setuptools/tests/test_wheel.py

@@ -114,11 +114,11 @@ def build_wheel(extra_file_defs=None, **kwargs):
 
 
 def tree_set(root):
-    contents = set()
-    for dirpath, dirnames, filenames in os.walk(root):
-        for filename in filenames:
-            contents.add(os.path.join(os.path.relpath(dirpath, root), filename))
-    return contents
+    return {
+        os.path.join(os.path.relpath(dirpath, root), filename)
+        for dirpath, dirnames, filenames in os.walk(root)
+        for filename in filenames
+    }
 
 
 def flatten_tree(tree):

tools/finalize.py

@@ -37,7 +37,7 @@ def _repair_changelog():
     """
     changelog_fn = pathlib.Path('NEWS.rst')
     changelog = changelog_fn.read_text(encoding='utf-8')
-    fixed = re.sub(r'^(v[0-9.]+)v[0-9.]+$', r'\1', changelog, flags=re.M)
+    fixed = re.sub(r'^(v[0-9.]+)v[0-9.]+$', r'\1', changelog, flags=re.MULTILINE)
     changelog_fn.write_text(fixed, encoding='utf-8')
     subprocess.check_output(['git', 'add', changelog_fn])