Skip to content

Commit f39a162

Browse files
author
Andrew J Westlake
committed
Updated python versions in the build matrix
1 parent ac3975e commit f39a162

File tree

1 file changed

+52
-19
lines changed

1 file changed

+52
-19
lines changed

.github/workflows/ci.yml

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: black --check .
2828
- name: Check rust formatting (rustfmt)
2929
run: cargo fmt --all -- --check
30-
30+
3131
clippy:
3232
runs-on: ubuntu-latest
3333
steps:
@@ -38,36 +38,69 @@ jobs:
3838
profile: minimal
3939
components: clippy
4040
- run: make clippy
41-
41+
4242
build:
4343
needs: [fmt] # don't wait for clippy as fails rarely and takes longer
4444
name: python${{ matrix.python-version }}-${{ matrix.platform.python-architecture }} ${{ matrix.platform.os }} ${{ matrix.msrv }}
4545
runs-on: ${{ matrix.platform.os }}
4646
strategy:
47-
fail-fast: false # If one platform fails, allow the rest to keep testing.
47+
fail-fast: false # If one platform fails, allow the rest to keep testing.
4848
matrix:
4949
rust: [stable]
50-
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy-3.6]
51-
platform: [
52-
{ os: "macOS-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
53-
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
54-
{ os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
55-
{ os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
56-
]
57-
exclude:
58-
# There is no 64-bit pypy on windows
59-
- python-version: pypy-3.6
60-
platform: { os: "windows-latest", python-architecture: "x64" }
50+
python-version:
51+
[
52+
"3.7",
53+
"3.8",
54+
"3.9",
55+
"3.10",
56+
"3.11-dev",
57+
"pypy-3.7",
58+
"pypy-3.8",
59+
"pypy-3.9",
60+
]
61+
platform:
62+
[
63+
{
64+
os: "macOS-latest",
65+
python-architecture: "x64",
66+
rust-target: "x86_64-apple-darwin",
67+
},
68+
{
69+
os: "ubuntu-latest",
70+
python-architecture: "x64",
71+
rust-target: "x86_64-unknown-linux-gnu",
72+
},
73+
{
74+
os: "windows-latest",
75+
python-architecture: "x64",
76+
rust-target: "x86_64-pc-windows-msvc",
77+
},
78+
{
79+
os: "windows-latest",
80+
python-architecture: "x86",
81+
rust-target: "i686-pc-windows-msvc",
82+
},
83+
]
6184
include:
6285
# Test minimal supported Rust version (no async-std)
6386
- rust: 1.45.0
6487
python-version: 3.9
65-
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
88+
platform:
89+
{
90+
os: "ubuntu-latest",
91+
python-architecture: "x64",
92+
rust-target: "x86_64-unknown-linux-gnu",
93+
}
6694
msrv: "MSRV"
6795
# Test minimal supported Rust version (with async-std)
6896
- rust: 1.46.0
6997
python-version: 3.9
70-
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
98+
platform:
99+
{
100+
os: "ubuntu-latest",
101+
python-architecture: "x64",
102+
rust-target: "x86_64-unknown-linux-gnu",
103+
}
71104
msrv: "MSRV"
72105

73106
steps:
@@ -107,7 +140,7 @@ jobs:
107140
- name: Build
108141
run: cargo build --features=${{env.features}} --verbose --target ${{ matrix.platform.rust-target }}
109142

110-
- if: matrix.platform.os != 'windows-latest'
143+
- if: matrix.platform.os != 'windows-latest'
111144
name: Install pyo3-asyncio test dependencies
112145
run: |
113146
python -m pip install -U uvloop
@@ -138,7 +171,7 @@ jobs:
138171
python -m pip install -U uvloop
139172
- uses: actions-rs/cargo@v1
140173
with:
141-
command: test
174+
command: test
142175
args: --all-features
143176
env:
144177
CARGO_INCREMENTAL: 0
@@ -148,4 +181,4 @@ jobs:
148181
id: coverage
149182
- uses: codecov/codecov-action@v1
150183
with:
151-
file: ${{ steps.coverage.outputs.report }}
184+
file: ${{ steps.coverage.outputs.report }}

0 commit comments

Comments
 (0)