Skip to content

Commit

Permalink
Merge pull request #209 from PyO3/dependabot/cargo/examples/namespace…
Browse files Browse the repository at this point in the history
…_package/pyo3-0.16.0
  • Loading branch information
dependabot[bot] authored Mar 22, 2022
2 parents 3831ae0 + 49e9000 commit 95994ce
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 118 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
# If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
matrix:
python-version: [3.7, 3.8, 3.9, "3.10", pypy-3.7, pypy-3.8]
python-version: ["3.7", "3.8", "3.9", "3.10", pypy-3.7, pypy-3.8]
platform: [
{ 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" },
Expand Down Expand Up @@ -96,11 +96,7 @@ jobs:
run: rustup target add aarch64-apple-darwin

- name: Install test dependencies
run: pip install --upgrade tox

- name: Install wheel (workaround python 3.10 CI issue)
if: matrix.python-version == '3.10-dev'
run: pip install --upgrade wheel
run: pip install --upgrade nox

- name: Build package
run: pip install -e .
Expand All @@ -109,10 +105,7 @@ jobs:
shell: bash
env:
PYTHON: ${{ matrix.python-version }}
run: |
for example_dir in examples/*; do
tox -c $example_dir -e py -vvvv
done
run: nox -s test-examples

- name: Test macOS universal2
if: matrix.platform.os == 'macos-latest' && !startsWith(matrix.python-version, 'pypy')
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

## Unreleased
### Packaging
- Drop support for Python 3.6. [#209](https://github.com/PyO3/setuptools-rust/pull/209)

### Added
- Add support for `kebab-case` executable names. [#205](https://github.com/PyO3/setuptools-rust/pull/205)
- Add support for custom cargo profiles. [#216](https://github.com/PyO3/setuptools-rust/pull/216)
Expand Down
12 changes: 12 additions & 0 deletions examples/hello-world/noxfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from os.path import dirname

import nox

SETUPTOOLS_RUST = dirname(dirname(dirname(__file__)))


@nox.session()
def test(session: nox.Session):
session.install(SETUPTOOLS_RUST)
session.install(".")
session.run("hello-world", *session.posargs)
Empty file added examples/hello-world/pytest.ini
Empty file.
10 changes: 0 additions & 10 deletions examples/hello-world/tox.ini

This file was deleted.

12 changes: 12 additions & 0 deletions examples/html-py-ever/noxfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from os.path import dirname

import nox

SETUPTOOLS_RUST = dirname(dirname(dirname(__file__)))


@nox.session()
def test(session: nox.Session):
session.install(SETUPTOOLS_RUST, "pytest", "pytest-benchmark", "beautifulsoup4")
session.install(".")
session.run("pytest", *session.posargs)
Empty file.
16 changes: 0 additions & 16 deletions examples/html-py-ever/tox.ini

This file was deleted.

72 changes: 22 additions & 50 deletions examples/namespace_package/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/namespace_package/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2018"
crate-type = ["cdylib"]

[dependencies]
pyo3 = { version = "0.15.1", features = ["extension-module"] }
pyo3 = { version = "0.16.2", features = ["extension-module"] }
12 changes: 12 additions & 0 deletions examples/namespace_package/noxfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from os.path import dirname

import nox

SETUPTOOLS_RUST = dirname(dirname(dirname(__file__)))


@nox.session()
def test(session: nox.Session):
session.install(SETUPTOOLS_RUST, "pytest")
session.install(".")
session.run("pytest", *session.posargs)
Empty file.
15 changes: 0 additions & 15 deletions examples/namespace_package/tox.ini

This file was deleted.

12 changes: 12 additions & 0 deletions examples/rust_with_cffi/noxfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from os.path import dirname

import nox

SETUPTOOLS_RUST = dirname(dirname(dirname(__file__)))


@nox.session()
def test(session: nox.Session):
session.install(SETUPTOOLS_RUST, "pytest", "cffi")
session.install(".")
session.run("pytest", *session.posargs)
Empty file.
15 changes: 0 additions & 15 deletions examples/rust_with_cffi/tox.ini

This file was deleted.

9 changes: 9 additions & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from glob import glob

import nox


@nox.session(name="test-examples", venv_backend="none")
def test_examples(session: nox.Session):
for example in glob("examples/*/noxfile.py"):
session.run("nox", "-f", example, external=True)
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ packages = setuptools_rust
zip_safe = True
install_requires = setuptools>=46.1; semantic_version>=2.8.2,<3; typing_extensions>=3.7.4.3
setup_requires = setuptools>=46.1; setuptools_scm>=6.3.2
python_requires = >=3.6
python_requires = >=3.7

[options.entry_points]
distutils.commands =
Expand Down

0 comments on commit 95994ce

Please sign in to comment.