Merge pull request #216 from jeromekelleher/run-on-arm

Run CI on macos-14 (ARM)

Author: jeromekelleher

.github/workflows/ci.yml

@@ -23,14 +23,18 @@ jobs:
       matrix:
         # Use macos-13 because pip binary packages for ARM aren't
         # available for many dependencies
-        os: [macos-13, ubuntu-latest]
+        os: [macos-13, macos-14, ubuntu-latest]
         python-version: ["3.9", "3.10", "3.11"]
         exclude:
           # Just run macos tests on one Python version
           - os: macos-13
             python-version: "3.9"
           - os: macos-13
             python-version: "3.10"
+          - os: macos-14
+            python-version: "3.9"
+          - os: macos-14
+            python-version: "3.10"
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -48,6 +52,10 @@ jobs:
         uses: coverallsapp/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          # The first coveralls upload will succeed and others seem to fail now.
+          # This is a quick workaround for doing a proper "parallel" setup:
+          # https://github.com/coverallsapp/github-action
+          fail-on-error: false
 
   packaging:
     name: Packaging

tests/test_simulated_data.py

@@ -1,4 +1,5 @@
-import msprime
+import sys
+
 import numpy.testing as nt
 import pysam
 import pytest
@@ -7,9 +8,13 @@
 from bio2zarr import vcf2zarr
 
 
+@pytest.mark.skipif(sys.platform == "darwin", reason="msprime OSX pip packages broken")
 class TestTskitRoundTripVcf:
     @pytest.mark.parametrize("ploidy", [1, 2, 3, 4])
     def test_ploidy(self, ploidy, tmp_path):
+        # FIXME importing here so pytest.skip avoids importing msprime.
+        import msprime
+
         ts = msprime.sim_ancestry(
             2,
             population_size=10**4,