Skip to content

Commit

Permalink
Merge #1417
Browse files Browse the repository at this point in the history
1417: Upgrade pyo3 to 0.18.0 r=messense a=messense

bors r+

Co-authored-by: messense <[email protected]>
  • Loading branch information
bors[bot] and messense authored Jan 18, 2023
2 parents 22221e9 + 009c1e5 commit 7879479
Show file tree
Hide file tree
Showing 31 changed files with 164 additions and 164 deletions.
2 changes: 1 addition & 1 deletion guide/src/distribution.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ or providing any Windows Python library files.

```toml
[dependencies]
pyo3 = { version = "0.17.3", features = ["extension-module", "generate-import-lib"] }
pyo3 = { version = "0.18.0", features = ["extension-module", "generate-import-lib"] }
```

It uses an external [`python3-dll-a`](https://docs.rs/python3-dll-a/latest/python3_dll_a/) crate to
Expand Down
12 changes: 6 additions & 6 deletions guide/src/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ crate-type = ["cdylib"]
rand = "0.8.4"

[dependencies.pyo3]
version = "0.17.3"
version = "0.18.0"
# "extension-module" tells pyo3 we want to build an extension module (skips linking against libpython.so)
# "abi3-py37" tells pyo3 (and maturin) to build using the stable ABI with minimum Python version 3.7
features = ["extension-module", "abi3-py37"]
Expand Down Expand Up @@ -190,7 +190,7 @@ So let's use maturin to build and install in our current environment.
(.venv) ferris@rustbox [~/src/rust/guessing-game] % maturin develop
🔗 Found pyo3 bindings with abi3 support for Python ≥ 3.7
🐍 Not using a specific python interpreter (With abi3, an interpreter is only required on windows)
Compiling pyo3-build-config v0.17.3
Compiling pyo3-build-config v0.18.0
Compiling libc v0.2.119
Compiling once_cell v1.10.0
Compiling cfg-if v1.0.0
Expand All @@ -211,10 +211,10 @@ So let's use maturin to build and install in our current environment.
Compiling rand_chacha v0.3.1
Compiling rand v0.8.5
Compiling quote v1.0.15
Compiling pyo3-ffi v0.17.3
Compiling pyo3 v0.17.3
Compiling pyo3-macros-backend v0.17.3
Compiling pyo3-macros v0.17.3
Compiling pyo3-ffi v0.18.0
Compiling pyo3 v0.18.0
Compiling pyo3-macros-backend v0.18.0
Compiling pyo3-macros v0.18.0
Compiling guessing-game v0.1.0 (/Users/ferris/src/rust/guessing-game)
Finished dev [unoptimized + debuginfo] target(s) in 13.31s
```
Expand Down
2 changes: 1 addition & 1 deletion src/templates/Cargo.toml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["cdylib"]

[dependencies]
{% if bindings == "pyo3" -%}
pyo3 = { version = "0.17.3", features = ["extension-module"] }
pyo3 = { version = "0.18.0", features = ["extension-module"] }
{% elif bindings == "rust-cpython" -%}
cpython = { version = "0.7.1", features = ["extension-module"] }
{% elif bindings == "uniffi" -%}
Expand Down
2 changes: 1 addition & 1 deletion test-crates/lib_with_disallowed_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ crate-type = ["cdylib"]

[dependencies]
libz-sys = { version = "1.1.2", default-features = false }
pyo3 = { version = "0.17.3", features = ["extension-module"] }
pyo3 = { version = "0.18.0", features = ["extension-module"] }
2 changes: 1 addition & 1 deletion test-crates/lib_with_path_dep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ crate-type = ["cdylib"]

[dependencies]
# Don't use the macros feature, which makes compilation much faster
pyo3 = { version = "0.17.3", default-features = false, features = ["extension-module"] }
pyo3 = { version = "0.18.0", default-features = false, features = ["extension-module"] }
some_path_dep = { path = "../some_path_dep" }
24 changes: 12 additions & 12 deletions test-crates/pyo3-abi3-without-version/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 test-crates/pyo3-abi3-without-version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["konstin <[email protected]>"]
edition = "2021"

[dependencies]
pyo3 = { version = "0.17.3", features = ["abi3", "extension-module"] }
pyo3 = { version = "0.18.0", features = ["abi3", "extension-module"] }

[lib]
name = "pyo3_abi3_without_version"
Expand Down
24 changes: 12 additions & 12 deletions test-crates/pyo3-bin/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 test-crates/pyo3-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
pyo3 = { version = "0.17.3", features = ["auto-initialize"] }
pyo3 = { version = "0.18.0", features = ["auto-initialize"] }
24 changes: 12 additions & 12 deletions test-crates/pyo3-feature/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 test-crates/pyo3-feature/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ version = "0.7.3"
edition = "2021"

[dependencies]
pyo3 = { version = "0.17.3", optional = true }
pyo3 = { version = "0.18.0", optional = true }
24 changes: 12 additions & 12 deletions test-crates/pyo3-mixed-include-exclude/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 test-crates/pyo3-mixed-include-exclude/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Implements a dummy function combining rust and python"
edition = "2021"

[dependencies]
pyo3 = { version = "0.17.3", features = [
pyo3 = { version = "0.18.0", features = [
"extension-module",
"generate-import-lib",
] }
Expand Down
Loading

0 comments on commit 7879479

Please sign in to comment.