Skip to content

Commit e74af16

Browse files
authored
Merge pull request #215 from PyO3/dependabot/cargo/examples/html-py-ever/pyo3-0.16.2
build(deps): bump pyo3 from 0.15.1 to 0.16.2 in /examples/html-py-ever
2 parents 2e908ab + 27cc541 commit e74af16

File tree

6 files changed

+35
-61
lines changed

6 files changed

+35
-61
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,20 @@ jobs:
5959
# If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
6060
fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
6161
matrix:
62-
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy-3.6, pypy-3.7]
62+
python-version: [3.7, 3.8, 3.9, "3.10", pypy-3.7, pypy-3.8]
6363
platform: [
6464
{ os: "macos-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
6565
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
6666
{ os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
6767
{ os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
6868
]
6969
exclude:
70-
# No 64-bit pypy 3.6 on Windows
71-
- python-version: pypy-3.6
72-
platform: { os: "windows-latest", python-architecture: "x64" }
73-
# Macos 11 actions runners don't support pypy-3.6
74-
- python-version: pypy-3.6
75-
platform: { os: "macos-latest" }
7670
# No 32-bit pypy 3.7 on Windows
7771
- python-version: pypy-3.7
7872
platform: { os: "windows-latest", python-architecture: "x86" }
73+
# No 32-bit pypy 3.8 on Windows
74+
- python-version: pypy-3.8
75+
platform: { os: "windows-latest", python-architecture: "x86" }
7976

8077
steps:
8178
- uses: actions/checkout@v2
@@ -219,8 +216,8 @@ jobs:
219216
source ~/.cargo/env
220217
rustup target add ${{ matrix.platform.target }}
221218
cd examples/rust_with_cffi/
222-
python3.6 -m pip install crossenv
223-
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
219+
python3.9 -m pip install crossenv
220+
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
224221
. venv/bin/activate
225222
build-pip install cffi wheel
226223
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/Cargo.lock

Lines changed: 24 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/html-py-ever/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66

77
[dependencies]
88
kuchiki = "0.8.0"
9-
pyo3 = { version = "0.15.1", features = ["extension-module"] }
9+
pyo3 = { version = "0.16.2", features = ["extension-module"] }
1010
tendril = "0.4.2"
1111

1212
[lib]

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

setuptools_rust/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from .extension import Binding, RustExtension
1010

11-
PyLimitedApi = Literal["cp36", "cp37", "cp38", "cp39", True, False]
11+
PyLimitedApi = Literal["cp36", "cp37", "cp38", "cp39", "cp310", True, False]
1212

1313

1414
def binding_features(

0 commit comments

Comments
 (0)