From c9523578e9c89f264f7162153e834a922701e893 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Wed, 28 Feb 2024 22:06:55 +0100 Subject: [PATCH] fix py feature --- Cargo.toml | 13 ++++++++----- members/libpt-py/Cargo.toml | 14 +++++++++----- members/libpt-py/pyproject.toml | 16 ---------------- members/libpt-py/src/lib.rs | 1 - 4 files changed, 17 insertions(+), 27 deletions(-) delete mode 100644 members/libpt-py/pyproject.toml diff --git a/Cargo.toml b/Cargo.toml index 0961758..e925040 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,9 +5,11 @@ members = [ "members/libpt-core", "members/libpt-math", "members/libpt-log", - "members/libpt-net", "members/libpt-py", + "members/libpt-net", + "members/libpt-py", ] default-members = [".", "members/libpt-core"] + [workspace.package] publish = true version = "0.3.11" @@ -18,7 +20,7 @@ description = "Personal multitool" readme = "README.md" homepage = "https://git.cscherr.de/PlexSheep/pt" repository = "https://git.cscherr.de/PlexSheep/pt" -keywords = ["cli", "library"] +keywords = ["library"] categories = [ "command-line-utilities", "development-tools", @@ -52,10 +54,11 @@ categories.workspace = true [features] default = ["log", "core"] core = [] -math = ["dep:libpt-math"] +full = ["default", "core", "math", "log", "bintols", "net", "py"] +math = ["dep:libpt-math", "log"] log = ["dep:libpt-log"] -bintols = ["dep:libpt-bintols"] -net = ["dep:libpt-net"] +bintols = ["dep:libpt-bintols", "log"] +net = ["dep:libpt-net", "log"] py = ["dep:libpt-py"] [lib] diff --git a/members/libpt-py/Cargo.toml b/members/libpt-py/Cargo.toml index 2ebdf45..82f0a39 100644 --- a/members/libpt-py/Cargo.toml +++ b/members/libpt-py/Cargo.toml @@ -1,12 +1,16 @@ [package] name = "libpt-py" version = "0.3.11" -edition = "2021" +edition.workspace = true +authors.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[lib] -name = "libpt" -crate-type = ["cdylib"] [dependencies] -pyo3 = { version = "0.19.0", features = ["full", "extension-module"] } +pyo3 = "0.19.0" + +[lib] +crate-type = ["cdylib", "rlib"] diff --git a/members/libpt-py/pyproject.toml b/members/libpt-py/pyproject.toml deleted file mode 100644 index 7d42dc0..0000000 --- a/members/libpt-py/pyproject.toml +++ /dev/null @@ -1,16 +0,0 @@ -[build-system] -requires = ["maturin>=1.1,<2.0"] -build-backend = "maturin" - -[project] -name = "libpt" -requires-python = ">=3.7" -classifiers = [ - "Programming Language :: Rust", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", -] - - -[tool.maturin] -features = ["pyo3/extension-module"] diff --git a/members/libpt-py/src/lib.rs b/members/libpt-py/src/lib.rs index b226085..2ee1d71 100644 --- a/members/libpt-py/src/lib.rs +++ b/members/libpt-py/src/lib.rs @@ -8,7 +8,6 @@ fn sum_as_string(a: usize, b: usize) -> PyResult { /// A Python module implemented in Rust. #[pymodule] -#[pyo3(name="libpt")] fn libpt_py(_py: Python, m: &PyModule) -> PyResult<()> { m.add_function(wrap_pyfunction!(sum_as_string, m)?)?; Ok(())