Merge pull request #172 from benjeffery/fix_wheels

Fix wheel building tests
tskit-dev · Nov 29, 2021 · 28a7479 · 28a7479
2 parents 79fd028 + d4bca42
commit 28a7479
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9, 3.10]
+        python: [3.7, 3.8, 3.9, "3.10"]
         wordsize: [64]
     steps:
       - name: Checkout
@@ -64,7 +64,7 @@ jobs:
           ${PYTHON} -c "import kastore"
           ${PYTHON} -m pip install -r python/requirements/CI/tests/requirements.txt
           rm -rf python/kastore python/*.pyd
-          ${PYTHON} -m nose -v python
+          ${PYTHON} -m pytest -v python
       - name: Upload Wheels
         uses: actions/upload-artifact@v2
         with:
@@ -75,7 +75,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9, 3.10]
+        python: [3.7, 3.8, 3.9, "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -108,7 +108,7 @@ jobs:
           python -c "import kastore"
           pip install -r python/requirements/CI/tests/requirements.txt
           rm -rf python/kastore python/*.so
-          python -m nose -v python
+          python -m pytest -v python
       - name: Upload Wheels
         uses: actions/upload-artifact@v2
         with:
@@ -146,7 +146,7 @@ jobs:
       - name: Set up Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10
+          python-version: "3.10"
 
       - name: Run tests (3.10)
         run: |
@@ -157,7 +157,7 @@ jobs:
           pip install -v kastore --only-binary kastore -f python/dist/wheelhouse --no-index
           python -c "import kastore"
           pip install -r python/requirements/CI/tests/requirements.txt
-          python -m nose -v python
+          python -m pytest -v python
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
@@ -173,7 +173,7 @@ jobs:
           pip install -v kastore --only-binary kastore -f python/dist/wheelhouse --no-index
           python -c "import kastore"
           pip install -r python/requirements/CI/tests/requirements.txt
-          python -m nose -v python
+          python -m pytest -v python
 
       - name: Set up Python 3.8
         uses: actions/setup-python@v2
@@ -189,7 +189,7 @@ jobs:
           pip install -v kastore --only-binary kastore -f python/dist/wheelhouse --no-index
           python -c "import kastore"
           pip install -r python/requirements/CI/tests/requirements.txt
-          python -m nose -v python
+          python -m pytest -v python
 
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
@@ -205,7 +205,7 @@ jobs:
           pip install -v kastore --only-binary kastore -f python/dist/wheelhouse --no-index
           python -c "import kastore"
           pip install -r python/requirements/CI/tests/requirements.txt
-          python -m nose -v python
+          python -m pytest -v python
 
       - name: Upload Wheels
         uses: actions/upload-artifact@v2

diff --git a/c/meson.build b/c/meson.build
@@ -1,4 +1,4 @@
-project('kastore', ['c', 'cpp'], 
+project('kastore', ['c', 'cpp'],
   default_options: [
     'c_std=c99', 
     'cpp_std=c++11', 

diff --git a/docker/shared.env b/docker/shared.env
@@ -1,5 +1,6 @@
 PYTHON_VERSIONS=(
+    cp310-cp310
+    cp39-cp39
     cp38-cp38
     cp37-cp37m
-    cp36-cp36m
 )