Merge branch 'main' into 3.x

Author: agronholm

tests/test_bdist_wheel.py

@@ -2,5 +2,5 @@
 
 
 def test_import_bdist_wheel() -> None:
-    with pytest.warns(DeprecationWarning, match="module has been removed"):
+    with pytest.warns(FutureWarning, match="no longer the canonical location"):
         from wheel.bdist_wheel import bdist_wheel  # noqa: F401