Fixed test failures

Author: agronholm

setuptools/command/bdist_wheel.py

@@ -230,8 +230,8 @@ class bdist_wheel(Command):
 
     boolean_options = ["keep-temp", "skip-build", "relative", "universal"]
 
-    def initialize_options(self):
-        self.bdist_dir: str = None
+    def initialize_options(self) -> None:
+        self.bdist_dir: str | None = None
         self.data_dir = None
         self.plat_name: str | None = None
         self.plat_tag = None

setuptools/tests/test_bdist_wheel.py

@@ -10,6 +10,7 @@
 import subprocess
 import sys
 import sysconfig
+from functools import partial
 from inspect import cleandoc
 from unittest.mock import Mock
 from zipfile import ZipFile
@@ -57,6 +58,40 @@
 """
 
 
+@pytest.fixture(scope="module")
+def wheel_paths(request, tmp_path_factory):
+    test_distributions = (
+        "complex-dist",
+        "simple.dist",
+        "headers.dist",
+        "commasinfilenames.dist",
+        "unicode.dist",
+    )
+
+    if sys.platform != "win32":
+        # ABI3 extensions don't really work on Windows
+        test_distributions += ("abi3extension.dist",)
+
+    pwd = os.path.abspath(os.curdir)
+    request.addfinalizer(partial(os.chdir, pwd))
+    this_dir = os.path.dirname(__file__)
+    build_dir = tmp_path_factory.mktemp("build")
+    dist_dir = tmp_path_factory.mktemp("dist")
+    for dist in test_distributions:
+        os.chdir(os.path.join(this_dir, "bdist_wheel_testdata", dist))
+        subprocess.check_call([
+            sys.executable,
+            "setup.py",
+            "bdist_wheel",
+            "-b",
+            str(build_dir),
+            "-d",
+            str(dist_dir),
+        ])
+
+    return sorted(str(fname) for fname in dist_dir.iterdir() if fname.suffix == ".whl")
+
+
 @pytest.fixture
 def dummy_dist(tmp_path_factory):
     basedir = tmp_path_factory.mktemp("dummy_dist")
@@ -227,7 +262,7 @@ def test_build_number(dummy_dist, monkeypatch, tmp_path):
 def test_limited_abi(monkeypatch, tmp_path):
     """Test that building a binary wheel with the limited ABI works."""
     this_dir = os.path.dirname(__file__)
-    source_dir = os.path.join(this_dir, "testdata", "extension.dist")
+    source_dir = os.path.join(this_dir, "bdist_wheel_testdata", "extension.dist")
     build_dir = tmp_path.joinpath("build")
     dist_dir = tmp_path.joinpath("dist")
     monkeypatch.chdir(source_dir)

setuptools/tests/test_build_meta.py

@@ -232,7 +232,7 @@ def build_backend(self, tmpdir, request):
 
     def test_get_requires_for_build_wheel(self, build_backend):
         actual = build_backend.get_requires_for_build_wheel()
-        expected = ['six', 'wheel']
+        expected = ['six']
         assert sorted(actual) == sorted(expected)
 
     def test_get_requires_for_build_sdist(self, build_backend):
@@ -783,14 +783,12 @@ def run():
         build_backend = self.get_build_backend()
 
         if use_wheel:
-            base_requirements = ['wheel']
             get_requires = build_backend.get_requires_for_build_wheel
         else:
-            base_requirements = []
             get_requires = build_backend.get_requires_for_build_sdist
 
         # Ensure that the build requirements are properly parsed
-        expected = sorted(base_requirements + requirements)
+        expected = sorted(requirements)
         actual = get_requires()
 
         assert expected == sorted(actual)
@@ -821,7 +819,7 @@ def test_setup_requires_with_auto_discovery(self, tmpdir_cwd):
         path.build(files)
         build_backend = self.get_build_backend()
         setup_requires = build_backend.get_requires_for_build_wheel()
-        assert setup_requires == ["wheel", "foo"]
+        assert setup_requires == ["foo"]
 
     def test_dont_install_setup_requires(self, tmpdir_cwd):
         files = {
@@ -963,7 +961,7 @@ def test_sys_exit_0_in_setuppy(monkeypatch, tmp_path):
         """
     (tmp_path / "setup.py").write_text(DALS(setuppy), encoding="utf-8")
     backend = BuildBackend(backend_name="setuptools.build_meta")
-    assert backend.get_requires_for_build_wheel() == ["wheel"]
+    assert backend.get_requires_for_build_wheel() == []
 
 
 def test_system_exit_in_setuppy(monkeypatch, tmp_path):