Merge pull request #4369 from agronholm/vendored-wheel

Adopted the bdist_wheel command from "wheel"

Author: agronholm

.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`

pyproject.toml

@@ -98,6 +98,7 @@ certs = []
 alias = "setuptools.command.alias:alias"
 bdist_egg = "setuptools.command.bdist_egg:bdist_egg"
 bdist_rpm = "setuptools.command.bdist_rpm:bdist_rpm"
+bdist_wheel = "setuptools.command.bdist_wheel:bdist_wheel"
 build = "setuptools.command.build:build"
 build_clib = "setuptools.command.build_clib:build_clib"
 build_ext = "setuptools.command.build_ext:build_ext"

setuptools/_vendor/vendored.txt

@@ -9,3 +9,4 @@ zipp==3.7.0
 tomli==2.0.1
 # required for jaraco.context on older Pythons
 backports.tarfile
+wheel==0.43.0

setuptools/_vendor/wheel-0.43.0.dist-info/INSTALLER

@@ -0,0 +1 @@
+pip

setuptools/_vendor/wheel-0.43.0.dist-info/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2012 Daniel Holth <[email protected]> and contributors
+
+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.