Merge branch 'main' of https://github.com/pypa/setuptools into type-c…

…heck-3.12

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 72.2.0
+current_version = 73.0.1
 commit = True
 tag = True
 

.coveragerc

@@ -17,6 +17,8 @@ disable_warnings =
 [report]
 show_missing = True
 exclude_also =
-	# jaraco/skeleton#97
-	@overload
+	# Exclude common false positives per
+	# https://coverage.readthedocs.io/en/latest/excluding.html#advanced-exclusion
+	# Ref jaraco/skeleton#97 and jaraco/skeleton#135
+	class .*\bProtocol\):
 	if TYPE_CHECKING:

NEWS.rst

@@ -1,3 +1,46 @@
+v73.0.1
+=======
+
+Bugfixes
+--------
+
+- Remove `abc.ABCMeta` metaclass from abstract classes. `pypa/setuptools#4503 <https://github.com/pypa/setuptools/pull/4503>`_ had an unintended consequence of causing potential ``TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases`` -- by :user:`Avasam` (#4579)
+
+
+v73.0.0
+=======
+
+Features
+--------
+
+- Mark abstract base classes and methods with `abc.ABC` and `abc.abstractmethod` -- by :user:`Avasam` (#4503)
+- Changed the order of type checks in ``setuptools.command.easy_install.CommandSpec.from_param`` to support any `collections.abc.Iterable` of `str` param -- by :user:`Avasam` (#4505)
+
+
+Bugfixes
+--------
+
+- Prevent an error in ``bdist_wheel`` if ``compression`` is set to a `str` (even if valid) after finalizing options but before running the command. -- by :user:`Avasam` (#4383)
+- Raises an exception when ``py_limited_api`` is used in a build with
+  ``Py_GIL_DISABLED``. This is currently not supported (python/cpython#111506). (#4420)
+- Synced with pypa/distutils@30b7331 including fix for modified check on empty sources (pypa/distutils#284).
+
+
+Deprecations and Removals
+-------------------------
+
+- ``setuptools`` is replacing the usages of :pypi:`ordered_set` with simple
+  instances of ``dict[Hashable, None]``. This is done to remove the extra
+  dependency and it is possible because since Python 3.7, ``dict`` maintain
+  insertion order. (#4574)
+
+
+Misc
+----
+
+- #4534, #4546, #4554, #4559, #4565
+
+
 v72.2.0
 =======
 

pkg_resources/__init__.py

@@ -23,7 +23,6 @@
 from __future__ import annotations
 
 import sys
-from abc import ABC
 
 if sys.version_info < (3, 8):  # noqa: UP036 # Check for unsupported versions
     raise RuntimeError("Python 3.8 or later is required")
@@ -306,7 +305,7 @@ def get_supported_platform():
 ]
 
 
-class ResolutionError(Exception, ABC):
+class ResolutionError(Exception):
     """Abstract base for dependency resolution errors"""
 
     def __repr__(self):

pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "72.2.0"
+version = "73.0.1"
 authors = [
 	{ name = "Python Packaging Authority", email = "distutils-sig@python.org" },
 ]
@@ -36,11 +36,6 @@ Changelog = "https://setuptools.pypa.io/en/stable/history.html"
 test = [
 	# upstream
 	"pytest >= 6, != 8.1.*",
-	"pytest-checkdocs >= 2.4",
-	"pytest-cov",
-	"pytest-mypy",
-	"pytest-enabler >= 2.2",
-	"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
 
 	# local
 	"virtualenv>=13.0.0",
@@ -81,6 +76,7 @@ test = [
 	# workaround for businho/pytest-ruff#28
 	'pytest-ruff < 0.4; platform_system == "Windows"',
 ]
+
 doc = [
 	# upstream
 	"sphinx >= 3.5",
@@ -110,7 +106,6 @@ ssl = []
 certs = []
 core = [
 	"packaging>=24",
-	"ordered-set>=3.1.1",
 	"more_itertools>=8.8",
 	"jaraco.text>=3.7",
 	"importlib_resources>=5.10.2; python_version < '3.9'",
@@ -122,6 +117,27 @@ core = [
 	"platformdirs >= 2.6.2",
 ]
 
+check = [
+	"pytest-checkdocs >= 2.4",
+	"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
+]
+
+cover = [
+	"pytest-cov",
+]
+
+enabler = [
+	"pytest-enabler >= 2.2",
+]
+
+type = [
+	# upstream
+	"pytest-mypy",
+
+	# local
+]
+
+
 [project.entry-points."distutils.commands"]
 alias = "setuptools.command.alias:alias"
 bdist_egg = "setuptools.command.bdist_egg:bdist_egg"

setuptools/__init__.py

@@ -11,7 +11,7 @@
 import os
 import re
 import sys
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 from typing import TYPE_CHECKING, TypeVar, overload
 
 sys.path.extend(((vendor_path := os.path.join(os.path.dirname(os.path.dirname(__file__)), 'setuptools', '_vendor')) not in sys.path) * [vendor_path])  # fmt: skip
@@ -127,7 +127,7 @@ def setup(**attrs):
     _Command = monkey.get_unpatched(distutils.core.Command)
 
 
-class Command(_Command, ABC):
+class Command(_Command):
     """
     Setuptools internal actions are organized using a *command design pattern*.
     This means that each action (or group of closely related actions) executed during

setuptools/_distutils/_modified.py

@@ -63,7 +63,7 @@ def missing_as_newer(source):
         return missing == 'newer' and not os.path.exists(source)
 
     ignored = os.path.exists if missing == 'ignore' else None
-    return any(
+    return not os.path.exists(target) or any(
         missing_as_newer(source) or _newer(source, target)
         for source in filter(ignored, sources)
     )

setuptools/_distutils/dist.py

@@ -658,7 +658,7 @@ def _show_help(
             )
             print()
 
-        for command in self.commands:
+        for command in commands:
             if isinstance(command, type) and issubclass(command, Command):
                 klass = command
             else:

setuptools/_distutils/tests/test_modified.py

@@ -117,3 +117,10 @@ def test_newer_pairwise_group(groups_target):
     newer = newer_pairwise_group([groups_target.newer], [groups_target.target])
     assert older == ([], [])
     assert newer == ([groups_target.newer], [groups_target.target])
+
+
+def test_newer_group_no_sources_no_target(tmp_path):
+    """
+    Consider no sources and no target "newer".
+    """
+    assert newer_group([], str(tmp_path / 'does-not-exist'))