Merge branch 'main' into type-setup-method

Author: Avasam

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
       matrix:
         python:
         - "3.9"
-        - "3.13"
+        - ">=3.13.5"  # temporary bound until it becomes the default, python/cpython#135151
         platform:
         - ubuntu-latest
         - macos-latest

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.9
+  rev: v0.12.0
   hooks:
   - id: ruff
     args: [--fix, --unsafe-fixes]

docs/userguide/interfaces.rst

@@ -50,6 +50,16 @@ reserve the right of speeding up the deprecation cycle and shortening deprecatio
 Note that these are exceptional circumstances and that the project will
 carefully attempt to find alternatives before resorting to unscheduled removals.
 
+.. important::
+   In the context of ``setuptools``, the introduction of :py:mod:`warnings`
+   (including deprecation warnings) is not considered a breaking change *per se*.
+   Instead it is considered a backwards compatible *communication action* that
+   precedes an upcoming breaking change. This is becauset code
+   containing warnings typically does not fail and can successfully terminate
+   execution, unless users explicitly opt into transforming those warnings
+   into errors (e.g., via Python's :external+python:ref:`-W option or
+   PYTHONWARNINGS environment variable <using-on-warnings>`).
+
 
 What to do when deprecation periods are undefined?
 --------------------------------------------------
@@ -147,7 +157,7 @@ you can still resort to restricting the version of Setuptools to be installed.
 This usually includes modifying ``[build-system] requires`` in ``pyproject.toml``
 and/or specifying ``pip`` :external+pip:ref:`Constraints Files` via
 the ``PIP_CONSTRAINT`` environment variable (or passing |build-constraint-uv|_).
-Please avoid however to pre-emptively add version constraints if not necessary,
+Please avoid however to preemptively add version constraints if not necessary,
 (you can read more about this in https://iscinumpy.dev/post/bound-version-constraints/).
 
 .. |build-constraint-uv| replace:: ``--build-constraint`` to ``uv``

newsfragments/5033.misc.rst

@@ -0,0 +1 @@
+Avoid repeated calls to ``str.startswith`` and ``str.endswith``.

pytest.ini

@@ -95,3 +95,7 @@ filterwarnings=
 
 	# Ignore warnings about consider_namespace_packages (jaraco/skeleton@6ff02e0eefcd)
 	ignore:Unknown config option. consider_namespace_packages:pytest.PytestConfigWarning
+
+	# Ignore warnings we cannot do anything about:
+	# https://github.com/pypa/setuptools/pull/5042#issuecomment-2981138461
+	ignore:Couldn't import C tracer:coverage.exceptions.CoverageWarning

ruff.toml

@@ -29,6 +29,7 @@ extend-select = [
 	"ISC", # flake8-implicit-str-concat
 	"FURB", # refurb
 	"PERF", # Perflint
+	"PIE", # flake8-pie
 	"PGH", # pygrep-hooks (blanket-* rules)
 	"PT", # flake8-pytest-style
 	"RUF10", # unused-noqa & redirected-noqa
@@ -73,6 +74,7 @@ ignore = [
 # Suppress nuisance warnings about module-import-not-at-top-of-file (E402) due to workaround for #4476
 "setuptools/__init__.py" = ["E402"]
 "pkg_resources/__init__.py" = ["E402", "ANN204"]
+"pkg_resources/tests/test_resources.py" = ["PT031"]
 
 [lint.isort]
 combine-as-imports = true

setuptools/command/bdist_egg.py

@@ -348,9 +348,9 @@ def analyze_egg(egg_dir, stubs):
     safe = True
     for base, dirs, files in walk_egg(egg_dir):
         for name in files:
-            if name.endswith('.py') or name.endswith('.pyw'):
+            if name.endswith(('.py', '.pyw')):
                 continue
-            elif name.endswith('.pyc') or name.endswith('.pyo'):
+            elif name.endswith(('.pyc', '.pyo')):
                 # always scan, even if we already know we're not safe
                 safe = scan_module(egg_dir, base, name, stubs) and safe
     return safe

setuptools/command/egg_info.py

@@ -146,7 +146,7 @@ def _maybe_tag(self, version):
     def _already_tagged(self, version: str) -> bool:
         # Depending on their format, tags may change with version normalization.
         # So in addition the regular tags, we have to search for the normalized ones.
-        return version.endswith(self.vtags) or version.endswith(self._safe_tags())
+        return version.endswith((self.vtags, self._safe_tags()))
 
     def _safe_tags(self) -> str:
         # To implement this we can rely on `safe_version` pretending to be version 0

setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py

@@ -103,7 +103,9 @@ def test_mixed_extras_require_optional_dependencies(tmp_path):
     path.build(files, prefix=tmp_path)
     pyproject = tmp_path / "pyproject.toml"
 
+    dist = Distribution({"extras_require": {"hello": ["world"]}})
+
     with pytest.warns(SetuptoolsWarning, match=".extras_require. overwritten"):
-        dist = Distribution({"extras_require": {"hello": ["world"]}})
         dist = apply_configuration(dist, pyproject)
-        assert dist.extras_require == {"docs": ["sphinx"]}
+
+    assert dist.extras_require == {"docs": ["sphinx"]}

setuptools/tests/test_build_py.py

@@ -165,7 +165,7 @@ def test_excluded_subpackages(tmpdir_cwd):
     build_py = dist.get_command_obj("build_py")
 
     msg = r"Python recognizes 'mypkg\.tests' as an importable package"
-    with pytest.warns(SetuptoolsDeprecationWarning, match=msg):
+    with pytest.warns(SetuptoolsDeprecationWarning, match=msg):  # noqa: PT031
         # TODO: To fix #3260 we need some transition period to deprecate the
         # existing behavior of `include_package_data`. After the transition, we
         # should remove the warning and fix the behavior.