Merge pull request #181 from davidhewitt/fix-macos-ci

ci: fix macos issues

Author: davidhewitt

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false  # If one platform fails, allow the rest to keep testing.
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy-3.6, pypy-3.7]
         platform: [
           { os: "macos-latest",   python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
           { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
@@ -37,6 +37,9 @@ jobs:
           # No 64-bit pypy 3.6 on Windows
           - python-version: pypy-3.6
             platform: { os: "windows-latest", python-architecture: "x64" }
+          # Macos 11 actions runners don't support pypy-3.6
+          - python-version: pypy-3.6
+            platform: { os: "macos-latest" }
           # No 32-bit pypy 3.7 on Windows
           - python-version: pypy-3.7
             platform: { os: "windows-latest", python-architecture: "x86" }
@@ -119,7 +122,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.9
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -139,21 +142,25 @@ jobs:
         run: |
           cd examples/rust_with_cffi/
           python --version
-          pip install wheel
-          python setup.py bdist_wheel --py-limited-api=cp36
+          pip install -U pip wheel setuptools
+          python setup.py bdist_wheel --py-limited-api=cp39
           ls -la dist/
+        env:
+          # https://github.com/actions/setup-python/issues/26
+          MACOSX_DEPLOYMENT_TARGET: 10.9
 
       # Now we switch to a differnet Python version and ensure we can install
       # the wheel we just built.
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: "3.10"
 
       - name: Install abi3 wheel and run tests
         shell: bash
         run: |
           cd examples/
+          pip install -U pip wheel setuptools
           python --version
           pip install rust_with_cffi/dist/rust_with_cffi*.whl
           python -c "from rust_with_cffi import rust; assert rust.rust_func() == 14"

examples/html-py-ever/Cargo.lock

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 kuchiki = "0.8.0"
-pyo3 = { version = "0.14.5", features = ["extension-module"] }
+pyo3 = { version = "0.15.1", features = ["extension-module"] }
 tendril = "0.4.2"
 
 [lib]

examples/html-py-ever/Cargo.toml

@@ -6,6 +6,5 @@ edition = "2018"
 [lib]
 crate-type = ["cdylib"]
 
-[dependencies.pyo3]
-version = "0.14.5"
-features = ["extension-module"]
+[dependencies]
+pyo3 = { version = "0.15.1", features = ["extension-module"] }

examples/namespace_package/Cargo.lock

@@ -5,7 +5,7 @@ authors = ["Alex Gaynor <alex.gaynor@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-pyo3 = { version = "0.14.5", features = ["extension-module"] }
+pyo3 = { version = "0.15.1", features = ["extension-module"] }
 
 [lib]
 name = "rust_with_cffi"