Merge branch 'master' into psobot/handle-zero-channel-mp3s

.github/workflows/all.yml

@@ -762,7 +762,7 @@ jobs:
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_ARCHS_WINDOWS: auto # Allow 32-bit Windows builds
           CIBW_ARCHS_LINUX: auto64 aarch64 # Useful for building linux images with Apple Silicon
-          CIBW_ARCHS_MACOS: x86_64 arm64 # Support Apple Silicon
+          CIBW_ARCHS_MACOS: x86_64 arm64 universal2 # Support Apple Silicon
           # on macOS and with Python 3.10: building NumPy from source fails without these options:
           CIBW_ENVIRONMENT: NPY_BLAS_ORDER="" NPY_LAPACK_ORDER="" CIBW_BUILD="${{ matrix.build }}"
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: pip install auditwheel-symbols && (auditwheel repair -w {dest_dir} {wheel} || auditwheel-symbols --manylinux 2010 {wheel})

tests/test_type_hints.py

@@ -44,6 +44,10 @@ def get_env_with_pythonpath() -> Dict[str, str]:
     os.environ.get("CIBW_BUILD") is not None,
     reason="Unable to get MyPy tests working while in cibuildwheel",
 )
+@pytest.mark.skipif(
+    os.environ.get("CI") is not None,
+    reason="Unable to get MyPy tests working reliably on CI",
+)
 @pytest.mark.parametrize("filename", PASSING_FIXTURES)
 def test_mypy_passes(filename):
     # Run this test in a subprocess, as MyPy forcibly exits, killing PyTest:
@@ -63,6 +67,10 @@ def test_mypy_passes(filename):
     os.environ.get("CIBW_BUILD") is not None,
     reason="Unable to get MyPy tests working while in cibuildwheel",
 )
+@pytest.mark.skipif(
+    os.environ.get("CI") is not None,
+    reason="Unable to get MyPy tests working reliably on CI",
+)
 @pytest.mark.parametrize("filename", FAILING_FIXTURES)
 def test_mypy_fails(filename):
     # Run this test in a subprocess, as MyPy forcibly exits, killing PyTest: