Skip to content

Commit 6d0a8ed

Browse files
committed
Stop testing Python 3.6 on CI
1 parent ebcefb2 commit 6d0a8ed

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,20 @@ jobs:
5454
strategy:
5555
fail-fast: false # If one platform fails, allow the rest to keep testing.
5656
matrix:
57-
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy-3.6, pypy-3.7]
57+
python-version: [3.7, 3.8, 3.9, "3.10", pypy-3.7, pypy-3.8]
5858
platform: [
5959
{ os: "macos-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
6060
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
6161
{ os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
6262
{ os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
6363
]
6464
exclude:
65-
# No 64-bit pypy 3.6 on Windows
66-
- python-version: pypy-3.6
67-
platform: { os: "windows-latest", python-architecture: "x64" }
68-
# Macos 11 actions runners don't support pypy-3.6
69-
- python-version: pypy-3.6
70-
platform: { os: "macos-latest" }
7165
# No 32-bit pypy 3.7 on Windows
7266
- python-version: pypy-3.7
7367
platform: { os: "windows-latest", python-architecture: "x86" }
68+
# No 32-bit pypy 3.8 on Windows
69+
- python-version: pypy-3.8
70+
platform: { os: "windows-latest", python-architecture: "x86" }
7471

7572
steps:
7673
- uses: actions/checkout@v2
@@ -210,8 +207,8 @@ jobs:
210207
source ~/.cargo/env
211208
rustup target add ${{ matrix.platform.target }}
212209
cd examples/rust_with_cffi/
213-
python3.6 -m pip install crossenv
214-
python3.6 -m crossenv "/opt/python/cp36-cp36m/bin/python3" --cc $TARGET_CC --cxx $TARGET_CXX --sysroot $TARGET_SYSROOT --env LIBRARY_PATH= --manylinux manylinux1 venv
210+
python3.9 -m pip install crossenv
211+
python3.9 -m crossenv "/opt/python/cp39-cp39/bin/python3" --cc $TARGET_CC --cxx $TARGET_CXX --sysroot $TARGET_SYSROOT --env LIBRARY_PATH= --manylinux manylinux1 venv
215212
. venv/bin/activate
216213
build-pip install cffi wheel
217214
cross-expose cffi

docs/building_wheels.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ This will create wheels in the `dist` directory:
4343

4444
```bash
4545
$ ls dist
46-
hello_rust-0.1.0-cp36-cp36m-linux_x86_64.whl hello_rust-0.1.0-cp36-cp36m-manylinux2014_x86_64.whl
4746
hello_rust-0.1.0-cp37-cp37m-linux_x86_64.whl hello_rust-0.1.0-cp37-cp37m-manylinux2014_x86_64.whl
4847
hello_rust-0.1.0-cp38-cp38-linux_x86_64.whl hello_rust-0.1.0-cp38-cp38-manylinux2014_x86_64.whl
4948
hello_rust-0.1.0-cp39-cp39-linux_x86_64.whl hello_rust-0.1.0-cp39-cp39-manylinux2014_x86_64.whl

examples/html-py-ever/build-wheels.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
55
export PATH="$HOME/.cargo/bin:$PATH"
66

77
# Compile wheels
8-
for PYBIN in /opt/python/cp{36,37,38,39,310}*/bin; do
8+
for PYBIN in /opt/python/cp{37,38,39,310}*/bin; do
99
rm -rf /io/build/
1010
"${PYBIN}/pip" install -U setuptools setuptools-rust wheel
1111
"${PYBIN}/pip" wheel /io/ -w /io/dist/ --no-deps
1212
done
1313

1414
# Bundle external shared libraries into the wheels
15-
for whl in /io/dist/*{cp36,cp37,cp38,cp39,cp310}*.whl; do
15+
for whl in /io/dist/*{cp37,cp38,cp39,cp310}*.whl; do
1616
auditwheel repair "$whl" -w /io/dist/
1717
done
1818

1919
# Install packages and test
20-
for PYBIN in /opt/python/cp{36,37,38,39,310}*/bin; do
20+
for PYBIN in /opt/python/cp{37,38,39,310}*/bin; do
2121
"${PYBIN}/pip" install html-py-ever -f /io/dist/
2222
done

0 commit comments

Comments
 (0)