luxolus/pyo3
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1325 from davidhewitt/pypy-ci-version

Browse source 
ci: use explicit pypy syntax
This commit is contained in:
David Hewitt 2020-12-18 23:09:58 +00:00 committed by GitHub
parent d416988f88 90a1221008
commit ff5e2d0856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View file

@ -45,7 +45,7 @@ jobs:
fail-fast: false # If one platform fails, allow the rest to keep testing. fail-fast: false # If one platform fails, allow the rest to keep testing.
matrix: matrix:
rust: [stable] rust: [stable]
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy3] python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy-3.6]
platform: [ platform: [
{ os: "macOS-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" }, { 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" }, { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
@ -54,7 +54,7 @@ jobs:
] ]
exclude: exclude:
# There is no 64-bit pypy on windows # There is no 64-bit pypy on windows
- python-version: pypy3 - python-version: pypy-3.6
platform: { os: "windows-latest", python-architecture: "x64" } platform: { os: "windows-latest", python-architecture: "x64" }
include: include:
# Test minimal supported Rust version # Test minimal supported Rust version
@ -91,11 +91,11 @@ jobs:
run: cargo build --features "num-bigint num-complex" --verbose --target ${{ matrix.platform.rust-target }} run: cargo build --features "num-bigint num-complex" --verbose --target ${{ matrix.platform.rust-target }}
# Run tests (except on PyPy, because no embedding API). # Run tests (except on PyPy, because no embedding API).
- if: matrix.python-version != 'pypy3' - if: matrix.python-version != 'pypy-3.6'
name: Test name: Test
run: cargo test --features "num-bigint num-complex" --target ${{ matrix.platform.rust-target }} run: cargo test --features "num-bigint num-complex" --target ${{ matrix.platform.rust-target }}
# Run tests again, but in abi3 mode # Run tests again, but in abi3 mode
- if: matrix.python-version != 'pypy3' - if: matrix.python-version != 'pypy-3.6'
name: Test (abi3) name: Test (abi3)
run: cargo test --no-default-features --features "abi3,macros" --target ${{ matrix.platform.rust-target }} run: cargo test --no-default-features --features "abi3,macros" --target ${{ matrix.platform.rust-target }}