Skip to content

Commit

Permalink
examples: update maturin to 0.13
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhewitt committed Aug 18, 2022
1 parent 2ccc034 commit ee73de2
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 24 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ jobs:
with:
target: aarch64-unknown-linux-gnu
manylinux: auto
args: --release -i python3.9 --no-sdist -m examples/maturin-starter/Cargo.toml
args: --release -i python3.9 -m examples/maturin-starter/Cargo.toml

- run: sudo rm -rf examples/maturin-starter/target
if: ${{ matrix.platform.os == 'ubuntu-latest' && matrix.python-version == '3.9' }}
Expand All @@ -271,14 +271,14 @@ jobs:
with:
target: x86_64-unknown-linux-gnu
manylinux: auto
args: --release -i python3.9 --no-sdist -m examples/maturin-starter/Cargo.toml
args: --release -i python3.9 -m examples/maturin-starter/Cargo.toml

- name: Test cross compilation
if: ${{ matrix.platform.os == 'macos-latest' && matrix.python-version == '3.9' }}
uses: messense/maturin-action@v1
with:
target: aarch64-apple-darwin
args: --release -i python3.9 --no-sdist -m examples/maturin-starter/Cargo.toml
args: --release -i python3.9 -m examples/maturin-starter/Cargo.toml

- name: Test cross compile to Windows
if: ${{ matrix.platform.os == 'ubuntu-latest' && matrix.python-version == '3.8' }}
Expand All @@ -301,7 +301,7 @@ jobs:
uses: messense/maturin-action@v1
with:
target: x86_64-pc-windows-gnu
args: -i python3.8 --no-sdist -m examples/maturin-starter/Cargo.toml --cargo-extra-args="--features abi3"
args: -i python3.8 -m examples/maturin-starter/Cargo.toml --cargo-extra-args="--features abi3"

env:
CARGO_TERM_VERBOSE: true
Expand Down
2 changes: 1 addition & 1 deletion examples/decorator/.template/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[project]
Expand Down
4 changes: 2 additions & 2 deletions examples/decorator/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[project]
name = "decorator"
version = "0.1.0"
classifier=[
classifiers = [
"License :: OSI Approved :: MIT License",
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
Expand Down
2 changes: 1 addition & 1 deletion examples/maturin-starter/.template/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[project]
Expand Down
4 changes: 2 additions & 2 deletions examples/maturin-starter/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[project]
name = "maturin-starter"
version = "0.1.0"
classifier=[
classifiers = [
"License :: OSI Approved :: MIT License",
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
Expand Down
4 changes: 2 additions & 2 deletions examples/word-count/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[project]
name = "word-count"
version = "0.1.0"
classifier=[
classifiers = [
"License :: OSI Approved :: MIT License",
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
Expand Down
11 changes: 0 additions & 11 deletions pytests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,3 @@ pyo3-build-config = { path = "../pyo3-build-config" }
[lib]
name = "pyo3_pytests"
crate-type = ["cdylib"]

[package.metadata.maturin]
classifier=[
"License :: OSI Approved :: MIT License",
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Rust",
"Operating System :: POSIX",
"Operating System :: MacOS :: MacOS X",
]
15 changes: 14 additions & 1 deletion pytests/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
[build-system]
requires = ["maturin>=0.12,<0.13"]
requires = ["maturin>=0.13,<0.14"]
build-backend = "maturin"

[tool.pytest.ini_options]
addopts = "--benchmark-disable"

[project]
name = "pyo3_pytests"
version = "0.1.0"
classifiers = [
"License :: OSI Approved :: MIT License",
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Rust",
"Operating System :: POSIX",
"Operating System :: MacOS :: MacOS X",
]

0 comments on commit ee73de2

Please sign in to comment.