Skip to content

Commit 95994ce

Browse files
Merge pull request #209 from PyO3/dependabot/cargo/examples/namespace_package/pyo3-0.16.0
2 parents 3831ae0 + 49e9000 commit 95994ce

File tree

18 files changed

+87
-118
lines changed

18 files changed

+87
-118
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ 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.7, 3.8, 3.9, "3.10", pypy-3.7, pypy-3.8]
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" },
@@ -96,11 +96,7 @@ jobs:
9696
run: rustup target add aarch64-apple-darwin
9797

9898
- name: Install test dependencies
99-
run: pip install --upgrade tox
100-
101-
- name: Install wheel (workaround python 3.10 CI issue)
102-
if: matrix.python-version == '3.10-dev'
103-
run: pip install --upgrade wheel
99+
run: pip install --upgrade nox
104100

105101
- name: Build package
106102
run: pip install -e .
@@ -109,10 +105,7 @@ jobs:
109105
shell: bash
110106
env:
111107
PYTHON: ${{ matrix.python-version }}
112-
run: |
113-
for example_dir in examples/*; do
114-
tox -c $example_dir -e py -vvvv
115-
done
108+
run: nox -s test-examples
116109

117110
- name: Test macOS universal2
118111
if: matrix.platform.os == 'macos-latest' && !startsWith(matrix.python-version, 'pypy')

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Changelog
22

33
## Unreleased
4+
### Packaging
5+
- Drop support for Python 3.6. [#209](https://github.com/PyO3/setuptools-rust/pull/209)
6+
47
### Added
58
- Add support for `kebab-case` executable names. [#205](https://github.com/PyO3/setuptools-rust/pull/205)
69
- Add support for custom cargo profiles. [#216](https://github.com/PyO3/setuptools-rust/pull/216)

examples/hello-world/noxfile.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
from os.path import dirname
2+
3+
import nox
4+
5+
SETUPTOOLS_RUST = dirname(dirname(dirname(__file__)))
6+
7+
8+
@nox.session()
9+
def test(session: nox.Session):
10+
session.install(SETUPTOOLS_RUST)
11+
session.install(".")
12+
session.run("hello-world", *session.posargs)

examples/hello-world/pytest.ini

Whitespace-only changes.

examples/hello-world/tox.ini

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/html-py-ever/noxfile.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
from os.path import dirname
2+
3+
import nox
4+
5+
SETUPTOOLS_RUST = dirname(dirname(dirname(__file__)))
6+
7+
8+
@nox.session()
9+
def test(session: nox.Session):
10+
session.install(SETUPTOOLS_RUST, "pytest", "pytest-benchmark", "beautifulsoup4")
11+
session.install(".")
12+
session.run("pytest", *session.posargs)

examples/html-py-ever/pytest.ini

Whitespace-only changes.

examples/html-py-ever/tox.ini

Lines changed: 0 additions & 16 deletions
This file was deleted.

examples/namespace_package/Cargo.lock

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

examples/namespace_package/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ edition = "2018"
77
crate-type = ["cdylib"]
88

99
[dependencies]
10-
pyo3 = { version = "0.15.1", features = ["extension-module"] }
10+
pyo3 = { version = "0.16.2", features = ["extension-module"] }

0 commit comments

Comments
 (0)