From 4df8bf6f1d1c4519ec5cb9f904bf5469205d5b36 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Tue, 21 Feb 2023 17:27:44 +0100 Subject: [PATCH] updated dependencies --- Cargo.toml | 6 +++--- bindings/python/Cargo.toml | 8 ++++---- bindings/python/src/lib.rs | 9 +++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e05e8d0..fa3c087 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,10 +20,10 @@ name = "benchmarks" [dependencies] bitflags = "1.3.2" clap = "2.34.0" -ibig = "0.3.5" +ibig = "0.3.6" num-traits = "0.2.15" -rayon = "1.5.3" -rustfst = "0.11.5" +rayon = "1.6.1" +rustfst = "0.13.1" sesdiff = "0.3.0" simple-error = "0.2.3" diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml index 338aff5..c24cf20 100644 --- a/bindings/python/Cargo.toml +++ b/bindings/python/Cargo.toml @@ -9,16 +9,16 @@ license = "GPL-3.0+" name = "analiticcl-python" readme = "README.md" repository = "https://github.com/proycon/analiticcl" -version = "0.4.4" #also change version in dependencies below +version = "0.4.5" #also change version in dependencies below [lib] name = "analiticcl" crate-type = ["cdylib"] [dependencies] -pyo3 = "0.13.2" -rayon = "1.5.0" -analiticcl = "0.4.4" +pyo3 = "0.18.1" +rayon = "1.6.1" +analiticcl = "0.4.5" #compile against version in same repo: (doesn't work when building with maturin for pypi) #[dependencies.analiticcl] diff --git a/bindings/python/src/lib.rs b/bindings/python/src/lib.rs index 896a55e..aca6012 100644 --- a/bindings/python/src/lib.rs +++ b/bindings/python/src/lib.rs @@ -16,7 +16,7 @@ pub struct PyWeights { #[pymethods] impl PyWeights { #[new] - #[args(kwargs = "**")] + #[pyo3(signature = (**kwargs))] fn new(kwargs: Option<&PyDict>) -> Self { let mut instance = Self::default(); if let Some(kwargs) = kwargs { @@ -142,7 +142,7 @@ pub struct PySearchParameters { #[pymethods] impl PySearchParameters { #[new] - #[args(kwargs = "**")] + #[pyo3(signature = (**kwargs))] fn new(kwargs: Option<&PyDict>) -> Self { let mut instance = Self::default(); if let Some(kwargs) = kwargs { @@ -448,7 +448,7 @@ pub struct PyVocabParams { #[pymethods] impl PyVocabParams { #[new] - #[args(kwargs = "**")] + #[pyo3(signature = (**kwargs))] fn new(kwargs: Option<&PyDict>) -> Self { let mut instance = Self::default(); if let Some(kwargs) = kwargs { @@ -578,7 +578,7 @@ impl PyVariantModel { #[pymethods] impl PyVariantModel { #[new] - #[args(alphabet_file, weights, debug = 0)] + #[pyo3(signature = (alphabet_file, weights, debug = 0))] fn new(alphabet_file: &str, weights: PyRef, debug: u8) -> Self { Self { model: libanaliticcl::VariantModel::new(alphabet_file, weights.weights.clone(), debug), @@ -593,6 +593,7 @@ impl PyVariantModel { } /// Add an item to the vocabulary. This is a lower-level interface. + #[pyo3(signature = (text,frequency,params))] pub fn add_to_vocabulary( &mut self, text: &str,