Merge remote-tracking branch 'upstream/main' into arm64

test/test_dependency_versions.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import platform
 import re
 import textwrap
 
@@ -60,6 +61,8 @@ def test_pinned_versions(tmp_path, python_version, build_frontend_env):
     build_environment = {}
 
     if python_version == "3.6":
+        if utils.platform == "macos" and platform.machine() == "arm64":
+            pytest.skip("macOS arm64 does not support Python 3.6")
         constraint_filename = "constraints-python36.txt"
         build_pattern = "[cp]p36-*"
     elif python_version == "3.7":
@@ -120,7 +123,7 @@ def test_dependency_constraints_file(tmp_path, build_frontend_env):
     tool_versions = {
         "pip": "20.0.2",
         "setuptools": "53.0.0",
-        "wheel": "0.34.2",
+        "wheel": "0.36.2",
         "virtualenv": "20.11.2",
     }
 

test/test_subdir_package.py

@@ -51,13 +51,13 @@ def test(capfd, tmp_path):
         add_env={
             "CIBW_BEFORE_BUILD": "python {project}/bin/before_build.py",
             "CIBW_TEST_COMMAND": "python {package}/test/run_tests.py",
-            # this shouldn't depend on the version of python, so build only CPython 3.6
-            "CIBW_BUILD": "cp36-*",
+            # this shouldn't depend on the version of python, so build only CPython 3.10
+            "CIBW_BUILD": "cp310-*",
         },
     )
 
     # check that the expected wheels are produced
-    expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp36" in w]
+    expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp310" in w]
     assert set(actual_wheels) == set(expected_wheels)
 
     captured = capfd.readouterr()

test/test_testing.py

@@ -143,6 +143,11 @@ def test_failing_test(tmp_path):
                 # problems with this, so let's check that.
                 "CIBW_MANYLINUX_I686_IMAGE": "manylinux1",
                 "CIBW_MANYLINUX_X86_64_IMAGE": "manylinux1",
+                # CPython 3.8 when running on macOS arm64 is unusual. The build
+                # always runs in x86_64, so the arm64 tests are not run. See
+                # #1169 for reasons why. That means the build succeeds, which
+                # we don't want. So we skip that build.
+                "CIBW_SKIP": "cp38-macosx_arm64",
             },
         )