Merge branch 'main' of https://github.com/pypa/setuptools into Bump-Ruff-and-mypy

Author: Avasam

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 76.0.0
+current_version = 78.1.1
 commit = True
 tag = True
 

.github/workflows/main.yml

@@ -28,7 +28,6 @@ env:
 
   # Suppress noisy pip warnings
   PIP_DISABLE_PIP_VERSION_CHECK: 'true'
-  PIP_NO_PYTHON_VERSION_WARNING: 'true'
   PIP_NO_WARN_SCRIPT_LOCATION: 'true'
 
   # Ensure tests can sense settings about the environment
@@ -64,7 +63,8 @@ jobs:
           python: "3.10"
           distutils: stdlib
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.14' }}
+    continue-on-error: ${{ matrix.python == '3.14' || matrix.python == 'pypy3.10' }}
+    # XXX: pypy seems to be flaky with unrelated tests in #6345
     env:
       SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils || 'local' }}
     timeout-minutes: 75

.pre-commit-config.yaml

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

NEWS.rst

@@ -1,3 +1,163 @@
+v78.1.1
+=======
+
+Bugfixes
+--------
+
+- More fully sanitized the filename in PackageIndex._download. (#4946)
+
+
+v78.1.0
+=======
+
+Features
+--------
+
+- Restore access to _get_vc_env with a warning. (#4874)
+
+
+v78.0.2
+=======
+
+Bugfixes
+--------
+
+- Postponed removals of deprecated dash-separated and uppercase fields in ``setup.cfg``.
+  All packages with deprecated configurations are advised to move before 2026. (#4911)
+
+
+v78.0.1
+=======
+
+Misc
+----
+
+- #4909
+
+
+v78.0.0
+=======
+
+Bugfixes
+--------
+
+- Reverted distutils changes that broke the monkey patching of command classes. (#4902)
+
+
+Deprecations and Removals
+-------------------------
+
+- Setuptools no longer accepts options containing uppercase or dash characters in ``setup.cfg``.
+  Please ensure to write the options in ``setup.cfg`` using the :wiki:`lower_snake_case <Snake_case>` convention
+  (e.g. ``Name => name``, ``install-requires => install_requires``).
+  This is a follow-up on deprecations introduced in
+  `v54.1.0 <https://setuptools.pypa.io/en/latest/history.html#v54-1-0>`_ (see #1608) and
+  `v54.1.1 <https://setuptools.pypa.io/en/latest/history.html#v54-1-1>`_ (see #2592).
+
+  .. note::
+     This change *does not affect configurations in* ``pyproject.toml``
+     (which uses the :wiki:`lower-kebab-case <Letter_case#Kebab_case>` convention following the precedent set in :pep:`517`/:pep:`518`). (#4870)
+
+
+Misc
+----
+
+- #4904
+
+
+v77.0.3
+=======
+
+Bugfixes
+--------
+
+- Temporarily convert error for license glob patterns containing ``../`` into a deprecation warning
+  to allow an accomodation period. (#4896)
+- Better error messages for ``packaging.licenses`` import errors in environments with ``packaging<24.2``\.
+  The import statement was also deferred to spare users that are not using
+  license expressions. (#4898)
+- Avoided eagerly raising an exception when ``license-files`` is defined
+  simultaneously inside and outside of ``pyproject.toml``.
+  Instead we rely on the existing deprecation error. (#4899)
+
+
+v77.0.2
+=======
+
+Bugfixes
+--------
+
+- Restore ``distutils.ccompiler._default_compilers`` -- by :user:`ManiacDC` (#4876)
+- Fixed copy pasta in ``msvc.shared_lib_format``\. (#4885)
+
+
+v77.0.1
+=======
+
+Bugfixes
+--------
+
+- Manually fix news fragment entries causing CI to crash when building docs. (#4891)
+
+
+v77.0.0
+=======
+
+Features
+--------
+
+- Added initial support for license expression (PEP :pep:`639 <639#add-license-expression-field>`). -- by :user:`cdce8p` (#4706)
+- Store ``License-File``\s in ``.dist-info/licenses`` subfolder and added support for recursive globs for ``license_files`` (PEP :pep:`639 <639#add-license-expression-field>`). -- by :user:`cdce8p` (#4728)
+- Bump core metadata version to ``2.4``\. -- by :user:`cdce8p` (#4830)
+- Updated vendored copy of ``wheel`` to ``v0.45.1``\. (#4869)
+
+
+Deprecations and Removals
+-------------------------
+
+- Added initial implementation of :pep:`639`.
+  Users relying on pre- :pep:`639` implementation details
+  (like precise license file paths inside ``dist-info`` directory)
+  may need to adjust their code base to avoid problems.
+  Deprecations and stronger validation were also introduced (#4829).
+- Added exception (or warning) when deprecated license classifiers are used,
+  according to PEP :pep:`639 <639#deprecate-license-classifiers>`. (#4833)
+- Deprecated ``tools.setuptools.license-files`` in favor of ``project.license-files``
+  and added exception if ``project.license-files`` and ``tools.setuptools.license-files``
+  are used together. -- by :user:`cdce8p` (#4837)
+- Deprecated ``project.license`` as a TOML table in
+  ``pyproject.toml``\. Users are expected to move towards using
+  ``project.license-files`` and/or SPDX expressions (as strings) in
+  ``project.license``\.
+  See PEP :pep:`639 <639#deprecate-license-key-table-subkeys>`. (#4840)
+- Added simple validation for given glob patterns in ``license-files``\:
+  a warning will be generated if no file is matched.
+  Invalid glob patterns can raise an exception.
+  -- thanks :user:`cdce8p` for contributions. (#4838)
+
+
+Misc
+----
+
+- #4734
+
+
+v76.1.0
+=======
+
+Features
+--------
+
+- In setuptools.msvc.EnvironmentInfo, now honor the correct paths when on an ARM host. (#4786)
+
+
+Bugfixes
+--------
+
+- Restored implicit distutils.ccompiler import for g-ir-scanner. (#4871)
+- Restore ``distutils.ccompiler.compiler_class`` -- by :user:`Avasam` (#4876)
+
+
 v75.3.2
 =======
 
@@ -1859,7 +2019,7 @@ Changes
 
   .. warning::
      Please note that future releases of setuptools will halt the build process
-     if a ``pyproject.toml`` file that does not match doc:`the PyPA Specification
+     if a ``pyproject.toml`` file that does not match :doc:`the PyPA Specification
      <PyPUG:specifications/section-distribution-metadata>` is given.
 * #3215: Updated ``pyproject.toml`` validation, as generated by ``validate-pyproject==0.6.1``.
 * #3218: Prevented builds from erroring if the project specifies metadata via

docs/userguide/miscellaneous.rst

@@ -24,7 +24,7 @@ files are included in a source distribution by default:
   in ``pyproject.toml`` and/or equivalent in ``setup.cfg``/``setup.py``;
   note that if you don't explicitly set this parameter, ``setuptools``
   will include any files that match the following glob patterns:
-  ``LICENSE*``, ``LICENCE*``, ``COPYING*``, ``NOTICE*``, ``AUTHORS**``;
+  ``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, ``AUTHORS**``;
 - ``pyproject.toml``;
 - ``setup.cfg``;
 - ``setup.py``;

docs/userguide/pyproject_config.rst

@@ -49,7 +49,7 @@ The ``project`` table contains metadata fields as described by the
    readme = "README.rst"
    requires-python = ">=3.8"
    keywords = ["one", "two"]
-   license = {text = "BSD-3-Clause"}
+   license = "BSD-3-Clause"
    classifiers = [
        "Framework :: Django",
        "Programming Language :: Python :: 3",
@@ -70,6 +70,14 @@ The ``project`` table contains metadata fields as described by the
    # ... other project metadata fields as listed in:
    #     https://packaging.python.org/en/latest/guides/writing-pyproject-toml/
 
+.. important::
+   Support for
+   :external+PyPUG:ref:`project.license-files <license-files>`
+   and SPDX license expressions in
+   :external+PyPUG:ref:`project.license <license>` (:pep:`639`)
+   were introduced in version 77.0.0.
+
+
 .. _setuptools-table:
 
 Setuptools-specific configuration
@@ -99,7 +107,8 @@ Key                       Value Type (TOML)           Notes
                                                       See :doc:`/userguide/datafiles`.
 ``exclude-package-data``  table/inline-table          Empty by default. See :doc:`/userguide/datafiles`.
 ------------------------- --------------------------- -------------------------
-``license-files``         array of glob patterns      **Provisional** - likely to change with :pep:`639`
+``license-files``         array of glob patterns      **Deprecated** - use ``project.license-files`` instead. See
+                                                      :external+PyPUG:ref:`Writing your pyproject.toml <license-files>`
                                                       (by default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``)
 ``data-files``            table/inline-table          **Discouraged** - check :doc:`/userguide/datafiles`.
                                                       Whenever possible, consider using data files inside the package directories.

newsfragments/4786.feature.rst

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "76.0.0"
+version = "78.1.1"
 authors = [
 	{ name = "Python Packaging Authority", email = "[email protected]" },
 ]
@@ -14,7 +14,6 @@ readme = "README.rst"
 classifiers = [
 	"Development Status :: 5 - Production/Stable",
 	"Intended Audience :: Developers",
-	"License :: OSI Approved :: MIT License",
 	"Programming Language :: Python :: 3",
 	"Programming Language :: Python :: 3 :: Only",
 	"Topic :: Software Development :: Libraries :: Python Modules",
@@ -101,9 +100,7 @@ core = [
 	"platformdirs >= 4.2.2", # Made ctypes optional (see #4461)
 
 	# for distutils
-	"jaraco.collections",
 	"jaraco.functools >= 4",
-	"packaging",
 	"more_itertools",
 ]
 

pyproject.toml

@@ -11,7 +11,6 @@ extend-select = [
 	"C901", # complex-structure
 	"I", # isort
 	"PERF401", # manual-list-comprehension
-	"W", # pycodestyle Warning
 
 	# Ensure modern type annotation syntax and best practices
 	# Not including those covered by type-checkers or exclusive to Python 3.11+
@@ -54,8 +53,6 @@ ignore = [
 	"Q003",
 	"COM812",
 	"COM819",
-	"ISC001",
-	"ISC002",
 
 	# local
 	"PERF203", # try-except-in-loop, micro-optimisation with many false-positive. Worth checking but don't block CI

ruff.toml

@@ -28,7 +28,7 @@
 def get_metadata_version(self):
     mv = getattr(self, 'metadata_version', None)
     if mv is None:
-        mv = Version('2.2')
+        mv = Version('2.4')
         self.metadata_version = mv
     return mv
 
@@ -88,6 +88,7 @@ def read_pkg_file(self, file):
     self.url = _read_field_from_msg(msg, 'home-page')
     self.download_url = _read_field_from_msg(msg, 'download-url')
     self.license = _read_field_unescaped_from_msg(msg, 'license')
+    self.license_expression = _read_field_unescaped_from_msg(msg, 'license-expression')
 
     self.long_description = _read_field_unescaped_from_msg(msg, 'description')
     if self.long_description is None and self.metadata_version >= Version('2.1'):
@@ -175,8 +176,9 @@ def write_field(key, value):
         if attr_val is not None:
             write_field(field, attr_val)
 
-    license = self.get_license()
-    if license:
+    if license_expression := self.license_expression:
+        write_field('License-Expression', license_expression)
+    elif license := self.get_license():
         write_field('License', rfc822_escape(license))
 
     for label, url in self.project_urls.items():
@@ -205,7 +207,8 @@ def write_field(key, value):
     if self.long_description_content_type:
         write_field('Description-Content-Type', self.long_description_content_type)
 
-    self._write_list(file, 'License-File', self.license_files or [])
+    safe_license_files = map(_safe_license_file, self.license_files or [])
+    self._write_list(file, 'License-File', safe_license_files)
     _write_requirements(self, file)
 
     for field, attr in _POSSIBLE_DYNAMIC_FIELDS.items():
@@ -291,6 +294,14 @@ def _distribution_fullname(name: str, version: str) -> str:
     )
 
 
+def _safe_license_file(file):
+    # XXX: Do we need this after the deprecation discussed in #4892, #4896??
+    normalized = os.path.normpath(file).replace(os.sep, "/")
+    if "../" in normalized:
+        return os.path.basename(normalized)  # Temporarily restore pre PEP639 behaviour
+    return normalized
+
+
 _POSSIBLE_DYNAMIC_FIELDS = {
     # Core Metadata Field x related Distribution attribute
     "author": "author",
@@ -302,7 +313,12 @@ def _distribution_fullname(name: str, version: str) -> str:
     "home-page": "url",
     "keywords": "keywords",
     "license": "license",
-    # "license-file": "license_files", # XXX: does PEP 639 exempt Dynamic ??
+    # XXX: License-File is complicated because the user gives globs that are expanded
+    #      during the build. Without special handling it is likely always
+    #      marked as Dynamic, which is an acceptable outcome according to:
+    #      https://github.com/pypa/setuptools/issues/4629#issuecomment-2331233677
+    "license-file": "license_files",
+    "license-expression": "license_expression",  # PEP 639
     "maintainer": "maintainer",
     "maintainer-email": "maintainer_email",
     "obsoletes": "obsoletes",