Skip to content

Update PyO3 to 0.25 #82

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

Merged
CarolineMorton merged 10 commits into from
Jun 5, 2025
Merged

Update PyO3 to 0.25 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4df5db7
migrate pyo3 from 0.20 to 0.21
oylenshpeegul Jun 4, 2025
d13aeab
migrate pyo3 from 0.21 to 0.22
oylenshpeegul Jun 4, 2025
886e1e1
migrate from pyo3 0.22 to 0.23
oylenshpeegul Jun 4, 2025
8c5f30d
migrate pyo3 from 0.23 to 0.25
oylenshpeegul Jun 4, 2025
8ae2271
Hm. is rustfmt from my editor not the same as cargo fmt?
oylenshpeegul Jun 4, 2025
e6ef8e2
test Python 3.13 too!
oylenshpeegul Jun 4, 2025
0a552a8
whitepace, really?
oylenshpeegul Jun 4, 2025
cf6b6d5
no, comma...grr
oylenshpeegul Jun 4, 2025
d62c884
wot?
oylenshpeegul Jun 4, 2025
5630fab
testing if this works!
CarolineMorton Jun 5, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/run_python_unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions bindings/python/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ name = "codelists_rs"
crate-type = ["cdylib"]

[dependencies]
pyo3 = { version = "0.20.3", features = ["extension-module"] }
pyo3 = { version = "0.25", features = ["extension-module"] }
chrono = { version = "0.4.39", features = ["serde"] }
codelist-rs = { path = "../../rust/codelist-rs" }
codelist-validator-rs = { path = "../../rust/codelist-validator-rs" }
indexmap = "2.9.0"
indexmap = "2.9.0"
3 changes: 2 additions & 1 deletion bindings/python/src/codelist.rs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl PyCodeList {
}

/// Add an entry to the codelist
#[pyo3(text_signature = "($self, code, term=None, comment=None)")]
#[pyo3(signature = (code, term=None, comment=None))]
Copy link
Collaborator

@CarolineMorton CarolineMorton Jun 4, 2025

Choose a reason for hiding this comment

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

i'm doubting myself now. I put these in the first place but i can see i only did it for a couple of the methods but not others. And they still seem to work. which makes me think that maybe we don't them at all. What do you think? Is the signature for overwriting the argument names maybe?

Great job anyway. Nice to see that their macro is actually getting simplier (signature vs text_signature)

Copy link
Collaborator Author

@oylenshpeegul oylenshpeegul Jun 4, 2025

Choose a reason for hiding this comment

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

I am happy to add this in, but I don't seem to be able to. I don't understand what's going on.

For the signature stuff, I think we do need it now. I'm not sure about text_signature.

Copy link
Collaborator Author

@oylenshpeegul oylenshpeegul Jun 4, 2025

Choose a reason for hiding this comment

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

And, yeah, I think we should test for 3.13 and I think it should work (it works on my machine...famous last words). If we're lucky, it will work with 3.14 (when it comes out) with no changes.

fn add_entry(
&mut self,
code: String,
Expand Down Expand Up @@ -370,6 +370,7 @@ impl PyCodeList {
}

/// Add Validation Information to the codelist
#[pyo3(signature = (reviewer, status=None, notes=None))]
fn add_validation_info(
&mut self,
reviewer: String,
Expand Down
6 changes: 3 additions & 3 deletions bindings/python/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ use factory::PyCodeListFactory;

/// Top-level Python module `codelists_rs`
#[pymodule]
fn codelists_rs(py: Python, m: &PyModule) -> PyResult<()> {
fn codelists_rs(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
Copy link
Collaborator

@CarolineMorton CarolineMorton Jun 4, 2025

Choose a reason for hiding this comment

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

Nice one !

// Add codelist submodule
let codelist_module = PyModule::new(py, "codelist")?;
codelist_module.add_class::<PyCodeList>()?;
m.add_submodule(codelist_module)?;
m.add_submodule(&codelist_module)?;
Copy link
Collaborator

@CarolineMorton CarolineMorton Jun 4, 2025

Choose a reason for hiding this comment

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

Brilliant - so now we do borrows!


// Register it globally under the full dotted path
py.import("sys")?.getattr("modules")?.set_item("codelists_rs.codelist", codelist_module)?;

// Add factory submodule
let factory_module = PyModule::new(py, "factory")?;
factory_module.add_class::<PyCodeListFactory>()?;
m.add_submodule(factory_module)?;
m.add_submodule(&factory_module)?;

// Register it globally under the full dotted path
py.import("sys")?.getattr("modules")?.set_item("codelists_rs.factory", factory_module)?;
Expand Down
Loading