Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc package updates #2563

Merged
merged 2 commits into from
Aug 18, 2022
Merged

misc package updates #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ccc034
msrv: unpin anyhow, pin bumpalo
davidhewitt Aug 18, 2022
5ca3001
examples: update maturin to 0.13
davidhewitt Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
cargo update -p plotters-svg --precise 0.3.1
cargo update -p plotters-backend --precise 0.3.2
cargo update -p serde --precise 1.0.142
cargo update -p anyhow --precise 1.0.60
cargo update -p bumpalo --precise 3.10.0

- name: Build docs
run: cargo doc --no-deps --no-default-features --features "full ${{ matrix.extra_features }}"
Expand Down 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 --features abi3

env:
CARGO_TERM_VERBOSE: true
Expand Down
2 changes: 1 addition & 1 deletion examples/decorator/.template/pyproject.toml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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",
]