Skip to content

Update pyo3 to v0.22 #276

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
mh-northlander merged 5 commits into from
Nov 19, 2024
Merged

Update pyo3 to v0.22 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
807ba55
update pyo3 to v0.22
mh-northlander Nov 7, 2024
545e4f4
add signature for trailing optional args
mh-northlander Nov 7, 2024
aea1180
explicit opt-in for enum comparison
mh-northlander Nov 7, 2024
83516d1
clone requires pyo3:Python
mh-northlander Nov 7, 2024
387a582
update cargo.lock
mh-northlander Nov 7, 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
79 changes: 13 additions & 66 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.

2 changes: 1 addition & 1 deletion python/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ name = "sudachipy"
crate-type = ["cdylib"]

[dependencies]
pyo3 = { version = "0.21", features = ["extension-module"] }
pyo3 = { version = "0.22", features = ["extension-module"] }
scopeguard = "1" # Apache 2.0/MIT
thread_local = "1.1" # Apache 2.0/MIT

Expand Down
10 changes: 8 additions & 2 deletions python/src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ fn create_file(p: &Path) -> std::io::Result<File> {
/// :type output: pathlib.Path | str
/// :type description: str
#[pyfunction]
#[pyo3(text_signature = "(matrix, lex, output, description=None) -> list[tuple[str, int, float]]")]
#[pyo3(
signature = (matrix, lex, output, description=None),
text_signature = "(matrix, lex, output, description=None) -> list[tuple[str, int, float]]",
)]
fn build_system_dic<'py>(
py: Python<'py>,
matrix: &Bound<'py, PyAny>,
Expand Down Expand Up @@ -120,7 +123,10 @@ fn build_system_dic<'py>(
/// :type output: pathlib.Path | str
/// :type description: str
#[pyfunction]
#[pyo3(text_signature = "(system, lex, output, description=None) -> list[tuple[str, int, float]]")]
#[pyo3(
signature = (system, lex, output, description=None),
text_signature = "(system, lex, output, description=None) -> list[tuple[str, int, float]]",
)]
fn build_user_dic<'py>(
py: Python<'py>,
system: &Bound<'py, PyAny>,
Expand Down
5 changes: 4 additions & 1 deletion python/src/dictionary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,10 @@ impl PyDictionary {
///
/// :type surface: str
/// :type out: MorphemeList | None
#[pyo3(text_signature = "(self, /, surface, out=None) -> MorphemeList")]
#[pyo3(
signature = (surface, out=None),
text_signature = "(self, /, surface, out=None) -> MorphemeList",
)]
fn lookup<'py>(
&'py self,
py: Python<'py>,
Expand Down
7 changes: 5 additions & 2 deletions python/src/morpheme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ impl PyMorphemeIter {
}

let morpheme = PyMorpheme {
list: self.list.clone(),
list: self.list.clone_ref(py),
index: self.index,
};

Expand Down Expand Up @@ -364,7 +364,10 @@ impl PyMorpheme {
/// :type mode: SplitMode | None
/// :type out: MorphemeList | None
/// :type add_single: bool
#[pyo3(text_signature = "(self, /, mode, out=None, add_single=False) -> MorphemeList")]
#[pyo3(
signature = (mode, out=None, add_single=false),
text_signature = "(self, /, mode, out=None, add_single=False) -> MorphemeList",
)]
fn split<'py>(
&'py self,
py: Python<'py>,
Expand Down
6 changes: 3 additions & 3 deletions python/src/tokenizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use crate::morpheme::{PyMorphemeListWrapper, PyProjector};
/// If None, returns SplitMode.C.
///
/// :type mode: str | None
#[pyclass(module = "sudachipy.tokenizer", name = "SplitMode", frozen)]
#[pyclass(module = "sudachipy.tokenizer", name = "SplitMode", eq, eq_int, frozen)]
#[derive(Clone, PartialEq, Eq, Copy, Debug)]
#[repr(u8)]
pub enum PySplitMode {
Expand Down Expand Up @@ -79,8 +79,8 @@ impl PySplitMode {
/// :type mode: str | None
#[new]
#[pyo3(
text_signature="(mode=None) -> SplitMode",
signature=(mode=None)
signature = (mode=None),
text_signature = "(mode=None) -> SplitMode"
)]
fn new(mode: Option<&str>) -> PyResult<PySplitMode> {
let mode = match mode {
Expand Down