Merge branch 'main' of https://github.com/pypa/setuptools into pyrigh…

…t-initial-config

.gitignore

@@ -8,6 +8,7 @@ include
 lib
 distribute.egg-info
 setuptools.egg-info
+setuptools/tests/bdist_wheel_testdata/*/*.egg-info/
 .coverage
 .eggs
 .tox

conftest.py

@@ -39,6 +39,7 @@ def pytest_configure(config):
     'pkg_resources/_vendor',
     'setuptools/config/_validate_pyproject',
     'setuptools/modified.py',
+    'setuptools/tests/bdist_wheel_testdata',
 ]
 
 

docs/build_meta.rst

@@ -60,10 +60,8 @@ being used to package your scripts and install from source). To use it with
     build-backend = "setuptools.build_meta"
 
 ``build_meta`` implements ``setuptools``' build system support.
-The ``setuptools`` package implements the ``build_sdist``
-command and the ``wheel`` package implements the ``build_wheel``
-command; the latter is a dependency of the former
-exposed via :pep:`517` hooks.
+The ``setuptools`` package implements the ``build_sdist`` and
+``build_wheel`` commands.
 
 Use ``setuptools``' :ref:`declarative config <declarative config>` to
 specify the package information in ``setup.cfg``::

docs/userguide/quickstart.rst

@@ -60,9 +60,9 @@ library will be used to actually do the packaging.
 
    Historically this documentation has unnecessarily listed ``wheel``
    in the ``requires`` list, and many projects still do that. This is
-   not recommended. The backend automatically adds ``wheel`` dependency
-   when it is required, and listing it explicitly causes it to be
-   unnecessarily required for source distribution builds.
+   not recommended, as the backend no longer requires the ``wheel``
+   package, and listing it explicitly causes it to be unnecessarily
+   required for source distribution builds.
    You should only include ``wheel`` in ``requires`` if you need to explicitly
    access it during build time (e.g. if your project needs a ``setup.py``
    script that imports ``wheel``).

mypy.ini

@@ -14,6 +14,7 @@ exclude = (?x)(
 	| ^.+?/(_vendor|extern)/ # Vendored
 	| ^setuptools/_distutils/ # Vendored
 	| ^setuptools/config/_validate_pyproject/ # Auto-generated
+    | ^setuptools/tests/bdist_wheel_testdata/  # Duplicate module name
 	)
 
 # Ignoring attr-defined because setuptools wraps a lot of distutils classes, adding new attributes,

newsfragments/1386.feature.rst

@@ -0,0 +1 @@
+Adopted the ``bdist_wheel`` command from the ``wheel`` project -- by :user:`agronholm`

newsfragments/4246.feature.rst

@@ -0,0 +1,4 @@
+Improve error message when ``pkg_resources.ZipProvider`` tries to extract resources with a missing Egg -- by :user:`Avasam`
+
+Added variables and parameter type annotations to ``pkg_resources`` to be nearly on par with typeshed.\* -- by :user:`Avasam`
+\* Excluding ``TypeVar`` and ``overload``. Return types are currently inferred.