Version fixes (#41)

* version fixes

* update version

actuator/__init__.py

@@ -1,12 +1,13 @@
 """Defines the top-level API for the actuator package."""
 
-__version__ = "0.0.25"
-
 from .bindings import (
     PyRobstrideMotorConfig as RobstrideMotorConfig,
     PyRobstrideMotorControlParams as RobstrideMotorControlParams,
     PyRobstrideMotorFeedback as RobstrideMotorFeedback,
     PyRobstrideMotors as RobstrideMotors,
     PyRobstrideMotorsSupervisor as RobstrideMotorsSupervisor,
     PyRobstrideMotorType as RobstrideMotorType,
+    get_version,
 )
+
+__version__ = get_version()

actuator/bindings/.gitignore

@@ -0,0 +1,3 @@
+# .gitignore
+
+*.pyi

actuator/bindings/src/lib.rs

@@ -1,6 +1,6 @@
 use pyo3::prelude::*;
 use pyo3_stub_gen::define_stub_info_gatherer;
-use pyo3_stub_gen::derive::{gen_stub_pyclass, gen_stub_pymethods};
+use pyo3_stub_gen::derive::{gen_stub_pyclass, gen_stub_pyfunction, gen_stub_pymethods};
 use robstride::{
     motor_mode_from_str as robstride_motor_mode_from_str,
     motor_type_from_str as robstride_motor_type_from_str, MotorConfig as RobstrideMotorConfig,
@@ -11,6 +11,12 @@ use robstride::{
 use std::collections::HashMap;
 use std::hash::{Hash, Hasher};
 
+#[pyfunction]
+#[gen_stub_pyfunction]
+fn get_version() -> String {
+    env!("CARGO_PKG_VERSION").to_string()
+}
+
 #[gen_stub_pyclass]
 #[pyclass]
 struct PyRobstrideMotors {
@@ -542,6 +548,7 @@ impl From<PyRobstrideMotorType> for RobstrideMotorType {
 
 #[pymodule]
 fn bindings(m: &Bound<PyModule>) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(get_version, m)?)?;
     m.add_class::<PyRobstrideMotors>()?;
     m.add_class::<PyRobstrideMotorFeedback>()?;
     m.add_class::<PyRobstrideMotorsSupervisor>()?;

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("actuator/__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 actuator/__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"actuator/{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"actuator/**/*.{ext}", recursive=True))
-
 
 class RustBuildExt(build_ext):
     def run(self) -> None:
@@ -62,7 +56,6 @@ def run(self) -> None:
     install_requires=requirements,
     extras_require={"dev": requirements_dev},
     include_package_data=True,
-    package_data={"actuator": package_data},
     packages=find_packages(include=["actuator"]),
     cmdclass={"build_ext": RustBuildExt},
 )