Merge branch 'main' into ANN204-wo-ignore-fully-untyped

Author: Avasam

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 80.7.1
+current_version = 80.9.0
 commit = True
 tag = True
 

LICENSE

@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

NEWS.rst

@@ -1,3 +1,24 @@
+v80.9.0
+=======
+
+Features
+--------
+
+- Set a deadline for the removal of pkg_resources later this year (December). (#3085)
+- Removed reliance on pkg_resources in test_wheel. (#3085)
+
+
+v80.8.0
+=======
+
+Features
+--------
+
+- Replaced more references to pkg_resources with importlib equivalents in wheel odule. (#3085)
+- Restore explicit LICENSE file. (#5001)
+- Removed no longer used build dependency on ``coherent.licensed``. (#5003)
+
+
 v80.7.1
 =======
 
@@ -660,7 +681,7 @@ v72.2.0
 Features
 --------
 
-- Merged with pypa/distutils@b7ee725f3 including: Support for Pathlike objects in data files and extensions (pypa/distutils#272, pypa/distutils#237), native support for C++ compilers (pypa/distuils#228) and removed unused get_msvcr() (pypa/distutils#274). (#4538)
+- Merged with pypa/distutils@b7ee725f3 including: Support for Pathlike objects in data files and extensions (pypa/distutils#272, pypa/distutils#237), native support for C++ compilers (pypa/distutils#228) and removed unused get_msvcr() (pypa/distutils#274). (#4538)
 
 
 v72.1.0

pkg_resources/__init__.py

@@ -97,8 +97,11 @@
 
 warnings.warn(
     "pkg_resources is deprecated as an API. "
-    "See https://setuptools.pypa.io/en/latest/pkg_resources.html",
-    DeprecationWarning,
+    "See https://setuptools.pypa.io/en/latest/pkg_resources.html. "
+    "The pkg_resources package is slated for removal as early as "
+    "2025-11-30. Refrain from using this package or pin to "
+    "Setuptools<81.",
+    UserWarning,
     stacklevel=2,
 )
 

pyproject.toml

@@ -3,14 +3,14 @@ requires = [
 	# "setuptools>=77",
 	# "setuptools_scm[toml]>=3.4.1",
 	# jaraco/skeleton#174
-	"coherent.licensed",
+	# "coherent.licensed",
 ]
 build-backend = "setuptools.build_meta"
 backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "80.7.1"
+version = "80.9.0"
 authors = [
 	{ name = "Python Packaging Authority", email = "[email protected]" },
 ]

pytest.ini

@@ -84,8 +84,8 @@ filterwarnings=
 	# Avoid errors when testing pkg_resources.declare_namespace
 	ignore:.*pkg_resources\.declare_namespace.*:DeprecationWarning
 
-	# suppress known deprecation
-	ignore:pkg_resources is deprecated:DeprecationWarning
+	# suppress known deprecation pypa/setuptools#3085
+	ignore:pkg_resources is deprecated:UserWarning
 
 	# Dependencies might not have been updated yet
 	default:onerror argument is deprecated, use onexc instead

ruff.toml

@@ -26,6 +26,7 @@ extend-select = [
 
 	# local
 	"ANN2", # missing-return-type-*
+	"ISC", # flake8-implicit-str-concat
 	"PERF", # Perflint
 	"PGH", # pygrep-hooks (blanket-* rules)
 	"PT", # flake8-pytest-style

setuptools/_discovery.py

@@ -0,0 +1,33 @@
+import functools
+import operator
+
+import packaging.requirements
+
+
+# from coherent.build.discovery
+def extras_from_dep(dep):
+    try:
+        markers = packaging.requirements.Requirement(dep).marker._markers
+    except AttributeError:
+        markers = ()
+    return set(
+        marker[2].value
+        for marker in markers
+        if isinstance(marker, tuple) and marker[0].value == 'extra'
+    )
+
+
+def extras_from_deps(deps):
+    """
+    >>> extras_from_deps(['requests'])
+    set()
+    >>> extras_from_deps(['pytest; extra == "test"'])
+    {'test'}
+    >>> sorted(extras_from_deps([
+    ...     'requests',
+    ...     'pytest; extra == "test"',
+    ...     'pytest-cov; extra == "test"',
+    ...     'sphinx; extra=="doc"']))
+    ['doc', 'test']
+    """
+    return functools.reduce(operator.or_, map(extras_from_dep, deps), set())

setuptools/command/install.py

@@ -22,7 +22,7 @@ def __getattr__(name: str):  # pragma: no cover
     if name == "_install":
         SetuptoolsDeprecationWarning.emit(
             "`setuptools.command._install` was an internal implementation detail "
-            + "that was left in for numpy<1.9 support.",
+            "that was left in for numpy<1.9 support.",
             due_date=(2025, 5, 2),  # Originally added on 2024-11-01
         )
         return orig.install

setuptools/command/sdist.py

@@ -30,7 +30,7 @@ class sdist(orig.sdist):
         (
             'keep-temp',
             'k',
-            "keep the distribution tree around after creating " + "archive file(s)",
+            "keep the distribution tree around after creating archive file(s)",
         ),
         (
             'dist-dir=',