Skip to content

Update to pyo3 v0.22 #104

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

Closed
wants to merge 11 commits into from
Closed

Update to pyo3 v0.22 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1313867
Migrate to pyo3 v0.21
benbrandt Sep 10, 2024
6f26d4f
Update to pyo3 v0.22
benbrandt Sep 10, 2024
33806e8
Revert changes to C APIs
benbrandt Sep 12, 2024
68706e3
Bump min versions
benbrandt Sep 12, 2024
5400976
Remove clone feature
benbrandt Sep 12, 2024
4fd7e1f
Use downcast_into instead of extract
benbrandt Sep 12, 2024
81aadf3
Cleanup unnecessary extracts
benbrandt Sep 12, 2024
77b8038
remove obsolete `dl` module
dicej Sep 13, 2024
6a66ae9
fix resource test regressions
dicej Sep 13, 2024
6f65b69
Revert assume_init() implementations
benbrandt Sep 13, 2024
f86dcd0
Always return Py instead of Bound objects
benbrandt Sep 13, 2024
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
75 changes: 18 additions & 57 deletions Cargo.lock
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "componentize_py"
crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = { version = "1.0.86", features = ["backtrace"] }
anyhow = { version = "1.0.87", features = ["backtrace"] }
clap = { version = "4.5.17", features = ["derive"] }
tar = "0.4.41"
tempfile = "3.12.0"
Expand All @@ -22,8 +22,8 @@ wasmparser = "0.216.0"
indexmap = "2.5.0"
bincode = "1.3.3"
heck = "0.5.0"
pyo3 = { version = "0.20.0", features = [
"abi3-py37",
pyo3 = { version = "0.22.2", features = [
"abi3-py39",
"extension-module",
], optional = true }
wasmtime = "24.0.0"
Expand All @@ -44,7 +44,7 @@ bytes = "1.7.1"
pretty_env_logger = "0.5.0"
cap-std = "3.2.0"
im-rc = "15.1.0"
serde = { version = "1.0.209", features = ["derive"] }
serde = { version = "1.0.210", features = ["derive"] }
toml = "0.8.19"
semver = "1.0.23"

Expand All @@ -61,3 +61,4 @@ test-generator = { path = "test-generator" }

[workspace]
members = ["runtime", "shared", "test-generator"]

2 changes: 1 addition & 1 deletion 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.15,<0.16"]
requires = ["maturin>=1.0,<2.0"]
build-backend = "maturin"

[tool.maturin]
Expand Down
4 changes: 2 additions & 2 deletions runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ edition = "2021"
crate-type = ["staticlib"]

[dependencies]
anyhow = "1.0.86"
anyhow = "1.0.87"
once_cell = "1.19.0"
pyo3 = { version = "0.20.0", features = ["abi3-py311", "num-bigint"] }
pyo3 = { version = "0.22.2", features = ["abi3-py312", "num-bigint"] }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like since this is embedded in the WIT world, we can tie this to the version of cpython we are using?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another thought: If I understand the resolver correctly, this will likely actually be targeting abi for 3.9? Since pyo3 is shared across the crates and it goes to the lowest enabled feature?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Features are additive, so presumably both the abi3-py312 and abi3-py39 features will be enabled. Not sure what that means in practice.

componentize-py-shared = { path = "../shared" }
num-bigint = "0.4.6"
wit-bindgen = "0.16.0"
Loading
Loading