Merge branch 'main' into generate-distuttils-stubs-on-install

Avasam · web-flow · commit 33bd900cc1d2 · 2025-11-02T11:17:54.000-05:00
diff --git a/.github/workflows/main.yml b/.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
diff --git a/.pre-commit-config.yaml b/.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]
diff --git a/docs/userguide/interfaces.rst b/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``
diff --git a/newsfragments/5033.misc.rst b/newsfragments/5033.misc.rst
@@ -0,0 +1 @@
+Avoid repeated calls to ``str.startswith`` and ``str.endswith``.
diff --git a/pyproject.toml b/pyproject.toml
@@ -56,6 +56,7 @@ test = [
 	"tomli-w>=1.0.0",
 	"pytest-timeout",
 	'pytest-perf; sys_platform != "cygwin"', # workaround for jaraco/inflect#195, pydantic/pydantic-core#773 (see #3986)
+	'pyobjc<12; sys_platform == "darwin" and python_version <= "3.9"', # workaround for #5105
 	# for tools/finalize.py
 	'jaraco.develop >= 7.21; python_version >= "3.9" and sys_platform != "cygwin"',
 	"pytest-home >= 0.5",
diff --git a/pytest.ini b/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
diff --git a/ruff.toml b/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
diff --git a/setup.py b/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import os
-import sys
 import textwrap
 
 import setuptools
@@ -10,33 +9,6 @@
 here = os.path.dirname(__file__)
 
 
-package_data = {
-    "": ["LICEN[CS]E*", "COPYING*", "NOTICE*", "AUTHORS*"],
-    "setuptools": ['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
-}
-
-force_windows_specific_files = os.environ.get(
-    "SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES", "1"
-).lower() not in ("", "0", "false", "no")
-
-include_windows_files = sys.platform == 'win32' or force_windows_specific_files
-
-if include_windows_files:
-    package_data.setdefault('setuptools', []).extend(['*.exe'])
-    package_data.setdefault('setuptools.command', []).extend(['*.xml'])
-
-
-def pypi_link(pkg_filename):
-    """
-    Given the filename, including md5 fragment, construct the
-    dependency link for PyPI.
-    """
-    root = 'https://files.pythonhosted.org/packages/source'
-    name, _sep, _rest = pkg_filename.partition('-')
-    parts = root, name[0], name, pkg_filename
-    return '/'.join(parts)
-
-
 class install_with_pth(install):
     """
     Custom install command to install a .pth file for distutils patching.
@@ -84,7 +56,6 @@ def _restore_install_lib(self):
 
 setup_params = dict(
     cmdclass={'install': install_with_pth},
-    package_data=package_data,
 )
 
 if __name__ == '__main__':
diff --git a/setuptools/command/bdist_egg.py b/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
diff --git a/setuptools/command/egg_info.py b/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
diff --git a/setuptools/discovery.py b/setuptools/discovery.py
@@ -95,22 +95,22 @@ def find(
         include: Iterable[str] = ('*',),
     ) -> list[str]:
         """Return a list of all Python items (packages or modules, depending on
-        the finder implementation) found within directory 'where'.
+        the finder implementation) found within directory ``where``.
 
-        'where' is the root directory which will be searched.
+        ``where`` is the root directory which will be searched.
         It should be supplied as a "cross-platform" (i.e. URL-style) path;
         it will be converted to the appropriate local path syntax.
 
-        'exclude' is a sequence of names to exclude; '*' can be used
+        ``exclude`` is a sequence of names to exclude; ``*`` can be used
         as a wildcard in the names.
-        When finding packages, 'foo.*' will exclude all subpackages of 'foo'
-        (but not 'foo' itself).
+        When finding packages, ``foo.*`` will exclude all subpackages of ``foo``
+        (but not ``foo`` itself).
 
-        'include' is a sequence of names to include.
+        ``include`` is a sequence of names to include.
         If it's specified, only the named items will be included.
         If it's not specified, all found items will be included.
-        'include' can contain shell style wildcard patterns just like
-        'exclude'.
+        ``include`` can contain shell style wildcard patterns just like
+        ``exclude``.
         """
 
         exclude = exclude or cls.DEFAULT_EXCLUDE
diff --git a/setuptools/tests/config/test_apply_pyprojecttoml.py b/setuptools/tests/config/test_apply_pyprojecttoml.py
@@ -160,7 +160,7 @@ def test_apply_pyproject_equivalent_to_setupcfg(url, monkeypatch, tmp_path):
   {name = "Tzu-Ping Chung"}
 ]
 maintainers = [
-  {name = "Степан Бандера", email = "криївка@оун-упа.укр"},
+  {name = "अंकित अहलावत", email = "ankit@example.com"},
 ]
 """
 
@@ -261,10 +261,10 @@ def test_no_explicit_content_type_for_missing_extension(tmp_path):
         ),
         pytest.param(
             PEP621_INTERNATIONAL_EMAIL_EXAMPLE,
-            'Степан Бандера <криївка@оун-упа.укр>',
+            'Ankit Ahlawat <अंकित@उदाहरण.भारत>',
             marks=pytest.mark.xfail(
                 reason="CPython's `email.headerregistry.Address` only supports "
-                'RFC 5322, as of Nov 10, 2022 and latest Python 3.11.0',
+                'RFC 5322, as of Oct 20, 2025 and latest Python 3.13.0',
                 strict=True,
             ),
             id='international-email',
diff --git a/setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py b/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"]}
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
@@ -187,30 +187,44 @@ def make_sdist(dist_path, files):
             dist.addfile(file_info, fileobj=file_bytes)
 
 
-def make_trivial_sdist(dist_path, distname, version):
+def make_trivial_sdist(dist_path, distname, version, setuptools_wheel=None):
     """
     Create a simple sdist tarball at dist_path, containing just a simple
     setup.py.
-    """
 
-    make_sdist(
-        dist_path,
-        [
-            (
-                'setup.py',
-                DALS(
-                    f"""\
-             import setuptools
-             setuptools.setup(
-                 name={distname!r},
-                 version={version!r}
-             )
-         """
-                ),
+    If ``setuptools_wheel`` is passed, a ``pyproject.toml`` file will also
+    be generated and the passed value will be used as location for
+    setuptools (as build dependency).
+    """
+    files = [
+        (
+            'setup.py',
+            DALS(
+                f"""\
+                 import setuptools
+                 setuptools.setup(
+                     name={distname!r},
+                     version={version!r}
+                 )
+                 """
             ),
-            ('setup.cfg', ''),
-        ],
-    )
+        ),
+        ('setup.cfg', ''),
+    ]
+
+    if setuptools_wheel:
+        files.append((
+            "pyproject.toml",
+            DALS(
+                f"""\
+                [build-system]
+                requires = ["setuptools @ {setuptools_wheel.as_uri()}"]
+                build-backend = "setuptools.build_meta"
+                """
+            ),
+        ))
+
+    make_sdist(dist_path, files)
 
 
 def make_nspkg_sdist(dist_path, distname, version):
diff --git a/setuptools/tests/test_build_py.py b/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.
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
@@ -15,7 +15,7 @@
 from distutils.errors import DistutilsSetupError
 
 
-def test_dist_fetch_build_egg(tmpdir):
+def test_dist_fetch_build_egg(tmpdir, setuptools_wheel):
     """
     Check multiple calls to `Distribution.fetch_build_egg` work as expected.
     """
@@ -25,7 +25,9 @@ def test_dist_fetch_build_egg(tmpdir):
     def sdist_with_index(distname, version):
         dist_dir = index.mkdir(distname)
         dist_sdist = f'{distname}-{version}.tar.gz'
-        make_trivial_sdist(str(dist_dir.join(dist_sdist)), distname, version)
+        make_trivial_sdist(
+            str(dist_dir.join(dist_sdist)), distname, version, setuptools_wheel
+        )
         with dist_dir.join('index.html').open('w') as fp:
             fp.write(
                 DALS(
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@ deps =
 	# Ideally all the dependencies should be set as "extras"
 setenv =
 	PYTHONWARNDEFAULTENCODING = 1
-	SETUPTOOLS_ENFORCE_DEPRECATION = {env:SETUPTOOLS_ENFORCE_DEPRECATION:1}
+	SETUPTOOLS_ENFORCE_DEPRECATION = {env:SETUPTOOLS_ENFORCE_DEPRECATION:0}  # TODO: return to 1 (temporarily disabled)
 commands =
 	pytest {posargs}
 usedevelop = True

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Avoid repeated calls to ``str.startswith`` and ``str.endswith``.