versions of stuff

pyklang/__init__.py

@@ -1,5 +1,6 @@
 """Defines the top-level package for PyKlang."""
 
-__version__ = "0.0.1"
+from .bindings import get_version
 
-from .bindings import add
+# Use the version from the Rust bindings.
+__version__ = get_version()

pyklang/bindings.pyi

@@ -2,6 +2,6 @@
 # ruff: noqa: E501, F401
 
 
-def add(a:int,b:int) -> int:
+def get_version() -> str:
     ...
 

pyklang/src/lib.rs

@@ -4,13 +4,14 @@ use pyo3_stub_gen::derive::*;
 
 #[pyfunction]
 #[gen_stub_pyfunction]
-fn add(a: u64, b: u64) -> u64 {
-    a + b
+fn get_version() -> String {
+    const VERSION: &str = env!("CARGO_PKG_VERSION");
+    VERSION.to_string()
 }
 
 #[pymodule]
 fn bindings(m: &Bound<PyModule>) -> PyResult<()> {
-    m.add_function(wrap_pyfunction!(add, m)?)?;
+    m.add_function(wrap_pyfunction!(get_version, m)?)?;
     Ok(())
 }
 

setup.py

@@ -2,7 +2,6 @@
 #!/usr/bin/env python
 """Setup script for the project."""
 
-import glob
 import re
 import subprocess
 
@@ -22,16 +21,11 @@
     requirements_dev: list[str] = f.read().splitlines()
 
 
-with open("pyklang/__init__.py", "r", encoding="utf-8") as fh:
-    version_re = re.search(r"^__version__ = \"([^\"]*)\"", fh.read(), re.MULTILINE)
-assert version_re is not None, "Could not find version in pyklang/__init__.py"
+with open("Cargo.toml", "r", encoding="utf-8") as fh:
+    version_re = re.search(r"^version = \"([^\"]*)\"", fh.read(), re.MULTILINE)
+assert version_re is not None, "Could not find version in Cargo.toml"
 version: str = version_re.group(1)
 
-package_data = [f"pyklang/{name}" for name in ("py.typed", "requirements.txt", "requirements-dev.txt")]
-package_data.append("Cargo.toml")
-for ext in ("pyi", "rs", "toml", "so"):
-    package_data.extend(glob.iglob(f"pyklang/**/*.{ext}", recursive=True))
-
 
 class RustBuildExt(build_ext):
     def run(self) -> None:
@@ -61,8 +55,6 @@ def run(self) -> None:
     python_requires=">=3.11",
     install_requires=requirements,
     extras_require={"dev": requirements_dev},
-    include_package_data=True,
-    package_data={"pyklang": package_data},
     packages=find_packages(include=["pyklang"]),
     cmdclass={"build_ext": RustBuildExt},
 )