refactor(py, imports): create preludes (#14)

* testing new pyo3 feat with a DAT

* refactor(py, imports): create preludes

* remove test dat

Author: rosofo

Cargo.lock

@@ -1,11 +1,6 @@
 #![feature(min_specialization)]
 
-use pyo3::impl_::pyclass::{PyClassImpl, PyMethods};
-use pyo3::prelude::PyAnyMethods;
-use pyo3::{pyclass, pymethods, Bound, PyAny, PyResult, Python};
-use std::pin::Pin;
-use td_rs_chop::cxx::AsPlugin;
-use td_rs_chop::*;
+use td_rs_chop::prelude::*;
 use td_rs_derive::*;
 use td_rs_derive_py::PyOp;
 

plugins/chop/python/src/lib.rs

@@ -86,18 +86,18 @@ pub const THE_CUBE_TEXTURE: [TexCoord; THE_CUBE_NUM_PTS] = [
     // front
     TexCoord::new(2.0 / 3.0, 0.0, 0.0),
     TexCoord::new(2.0 / 3.0, 0.5, 0.0),
-    TexCoord::new(3.0 / 3.0, 0.0, 0.0),
-    TexCoord::new(3.0 / 3.0, 0.5, 0.0),
+    TexCoord::new(1.0, 0.0, 0.0),
+    TexCoord::new(1.0, 0.5, 0.0),
     // back
     TexCoord::new(0.0 / 3.0, 0.5, 0.0),
     TexCoord::new(0.0 / 3.0, 0.0, 0.0),
     TexCoord::new(1.0 / 3.0, 0.5, 0.0),
     TexCoord::new(1.0 / 3.0, 0.0, 0.0),
     // top
     TexCoord::new(2.0 / 3.0, 1.0, 0.0),
-    TexCoord::new(3.0 / 3.0, 1.0, 0.0),
+    TexCoord::new(1.0, 1.0, 0.0),
     TexCoord::new(2.0 / 3.0, 0.5, 0.0),
-    TexCoord::new(3.0 / 3.0, 0.5, 0.0),
+    TexCoord::new(1.0, 0.5, 0.0),
     // bottom
     TexCoord::new(1.0 / 3.0, 0.5, 0.0),
     TexCoord::new(2.0 / 3.0, 0.5, 0.0),

plugins/sop/generator-sop/src/shapes.rs

@@ -13,6 +13,7 @@ cxx = "1.0.78"
 td-rs-base = { path = "../td-rs-base" }
 tracing-base = { package = "tracing", version = "0.1", optional = true }
 tracing-subscriber = { version = "0.2", optional = true }
+pyo3 = { git = "https://github.com/tychedelia/pyo3", branch = "td-rs", features = ["abi3-py311"], optional = true }
 
 [build-dependencies]
 td-rs-autocxx-build = { path = "../td-rs-autocxx-build" }
@@ -21,6 +22,6 @@ miette = { version="5", features = [ "fancy" ] }
 
 [features]
 default = []
-python = ["td-rs-base/python"]
+python = ["td-rs-base/python", "dep:pyo3"]
 tracing = ["td-rs-base/tracing", "tracing-base", "tracing-subscriber"]
 tokio = ["td-rs-base/tokio"]

td-rs-chop/Cargo.toml

@@ -8,6 +8,7 @@ pub use td_rs_base::chop::*;
 pub use td_rs_base::*;
 
 pub mod cxx;
+pub mod prelude;
 
 #[derive(Debug, Default)]
 pub struct ChopOutputInfo {

td-rs-chop/src/lib.rs

@@ -0,0 +1,9 @@
+pub use crate::cxx::AsPlugin;
+pub use crate::*;
+
+#[cfg(feature = "python")]
+pub use pyo3::impl_::pyclass::{PyClassImpl, PyMethods};
+#[cfg(feature = "python")]
+pub use pyo3::prelude::*;
+#[cfg(feature = "python")]
+pub use std::pin::Pin;

td-rs-chop/src/prelude.rs

@@ -15,6 +15,7 @@ ref-cast = "1.0"
 sparsevec = "0.2.0"
 tracing-base = { package = "tracing", version = "0.1", optional = true }
 tracing-subscriber = { version = "0.2", optional = true }
+pyo3 = { git = "https://github.com/tychedelia/pyo3", branch = "td-rs", features = ["abi3-py311"], optional = true }
 
 [build-dependencies]
 td-rs-autocxx-build = { path = "../td-rs-autocxx-build" }
@@ -23,6 +24,6 @@ miette = { version="5", features = [ "fancy" ] }
 
 [features]
 default = []
-python = ["td-rs-base/python"]
+python = ["td-rs-base/python", "dep:pyo3"]
 tracing = ["td-rs-base/tracing", "tracing-base", "tracing-subscriber"]
 tokio = ["td-rs-base/tokio"]

td-rs-dat/Cargo.toml

@@ -7,6 +7,7 @@ pub use td_rs_base::param::OperatorParams;
 pub use td_rs_base::*;
 
 pub mod cxx;
+pub mod prelude;
 
 #[derive(Debug, Default)]
 pub struct DatGeneralInfo {

td-rs-dat/src/lib.rs

@@ -0,0 +1,9 @@
+pub use crate::cxx::AsPlugin;
+pub use crate::*;
+
+#[cfg(feature = "python")]
+pub use pyo3::impl_::pyclass::{PyClassImpl, PyMethods};
+#[cfg(feature = "python")]
+pub use pyo3::prelude::*;
+#[cfg(feature = "python")]
+pub use std::pin::Pin;

td-rs-dat/src/prelude.rs

@@ -14,6 +14,7 @@ td-rs-base = { path = "../td-rs-base" }
 ref-cast = "1.0"
 tracing-base = { package = "tracing", version = "0.1", optional = true }
 tracing-subscriber = { version = "0.2", optional = true }
+pyo3 = { git = "https://github.com/tychedelia/pyo3", branch = "td-rs", features = ["abi3-py311"], optional = true }
 
 [build-dependencies]
 td-rs-autocxx-build = { path = "../td-rs-autocxx-build" }
@@ -22,6 +23,6 @@ miette = { version="5", features = [ "fancy" ] }
 
 [features]
 default = []
-python = ["td-rs-base/python"]
+python = ["td-rs-base/python", "dep:pyo3"]
 tracing = ["td-rs-base/tracing", "tracing-base", "tracing-subscriber"]
 tokio = ["td-rs-base/tokio"]