Submodules cannot be found in Python project

lox-space · Jan 16, 2024 · 8029975 · 8029975
1 parent e1b0d3b
commit 8029975
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/crates/lox_py/src/bodies.rs b/crates/lox_py/src/bodies.rs
@@ -13,7 +13,7 @@ use lox_core::bodies::*;
 use crate::LoxPyError;
 
 #[pyclass(name = "Sun")]
-struct PySun;
+pub struct PySun;
 
 #[pymethods]
 impl PySun {
@@ -56,7 +56,7 @@ impl PySun {
 }
 
 #[pyclass(name = "Barycenter")]
-struct PyBarycenter(Box<dyn PointMass + Send>);
+pub struct PyBarycenter(Box<dyn PointMass + Send>);
 
 #[pymethods]
 impl PyBarycenter {
@@ -105,7 +105,7 @@ impl PyBarycenter {
 }
 
 #[pyclass(name = "Planet")]
-struct PyPlanet(Box<dyn Planet + Send>);
+pub struct PyPlanet(Box<dyn Planet + Send>);
 
 #[pymethods]
 impl PyPlanet {
@@ -163,7 +163,7 @@ impl PyPlanet {
 }
 
 #[pyclass(name = "Satellite")]
-struct PySatellite(Box<dyn Satellite + Send>);
+pub struct PySatellite(Box<dyn Satellite + Send>);
 
 #[pymethods]
 impl PySatellite {
@@ -256,7 +256,7 @@ impl PySatellite {
 }
 
 #[pyclass(name = "MinorBody")]
-struct PyMinorBody(Box<dyn MinorBody + Send>);
+pub struct PyMinorBody(Box<dyn MinorBody + Send>);
 
 #[pymethods]
 impl PyMinorBody {
@@ -312,14 +312,3 @@ impl PyMinorBody {
         self.0.along_orbit_radius()
     }
 }
-
-#[pymodule]
-#[pyo3(name = "bodies")]
-pub fn module(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_class::<PySun>()?;
-    m.add_class::<PyBarycenter>()?;
-    m.add_class::<PyPlanet>()?;
-    m.add_class::<PySatellite>()?;
-    m.add_class::<PyMinorBody>()?;
-    Ok(())
-}
diff --git a/crates/lox_py/src/lib.rs b/crates/lox_py/src/lib.rs
@@ -8,14 +8,15 @@
 
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
-use pyo3::wrap_pymodule;
 use thiserror::Error;
 
 use lox_core::errors::LoxError;
 use lox_core::time::dates::{Date, Time};
 use lox_core::time::epochs::Epoch;
 use lox_core::time::epochs::TimeScale;
 
+use crate::bodies::{PyBarycenter, PyMinorBody, PyPlanet, PySatellite, PySun};
+
 mod bodies;
 
 #[derive(Error, Debug)]
@@ -145,8 +146,12 @@ impl PyEpoch {
 /// A Python module implemented in Rust.
 #[pymodule]
 fn lox_space(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_wrapped(wrap_pymodule!(bodies::module))?;
     m.add_class::<PyTimeScale>()?;
     m.add_class::<PyEpoch>()?;
+    m.add_class::<PySun>()?;
+    m.add_class::<PyBarycenter>()?;
+    m.add_class::<PyPlanet>()?;
+    m.add_class::<PySatellite>()?;
+    m.add_class::<PyMinorBody>()?;
     Ok(())
 }