Merge pull request #4386 from DimitriPapadopoulos/FURB

Enforce ruff/refurb rules (FURB)

Author: jaraco

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]:
         """