Rename _rust module to submodule-specific name (#76)

kylebarron · Jul 29, 2024 · c0f68c4 · c0f68c4
1 parent eac16fe
commit c0f68c4
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 24 deletions.
diff --git a/DEVELOP.md b/DEVELOP.md
@@ -4,8 +4,9 @@
 ```bash
 rm -rf .venv
 poetry install
-poetry run maturin build -m arro3-compute/Cargo.toml -o dist
+# Note: need to install core first because others depend on core
 poetry run maturin build -m arro3-core/Cargo.toml -o dist
+poetry run maturin build -m arro3-compute/Cargo.toml -o dist
 poetry run maturin build -m arro3-io/Cargo.toml -o dist
 poetry run pip install dist/*
 poetry run mkdocs serve

diff --git a/arro3-compute/Cargo.toml b/arro3-compute/Cargo.toml
@@ -13,7 +13,7 @@ rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "_rust"
+name = "_compute"
 crate-type = ["cdylib"]
 
 [dependencies]

diff --git a/arro3-compute/pyproject.toml b/arro3-compute/pyproject.toml
@@ -14,7 +14,7 @@ classifiers = [
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
-module-name = "arro3.compute._rust"
+module-name = "arro3.compute._compute"
 python-source = "python"
 
 [tool.poetry]

diff --git a/arro3-compute/python/arro3/compute/__init__.py b/arro3-compute/python/arro3/compute/__init__.py
@@ -1,4 +1,4 @@
-from ._rust import *
-from ._rust import ___version
+from ._compute import *
+from ._compute import ___version
 
 __version__: str = ___version()
diff --git a/arro3-compute/python/arro3/compute/_rust.pyi → ...compute/python/arro3/compute/_compute.pyi b/arro3-compute/python/arro3/compute/_rust.pyi → ...compute/python/arro3/compute/_compute.pyi
diff --git a/arro3-compute/src/lib.rs b/arro3-compute/src/lib.rs
@@ -14,7 +14,7 @@ fn ___version() -> &'static str {
 }
 
 #[pymodule]
-fn _rust(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
+fn _compute(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(___version))?;
 
     m.add_wrapped(wrap_pyfunction!(cast::cast))?;

diff --git a/arro3-core/Cargo.toml b/arro3-core/Cargo.toml
@@ -13,7 +13,7 @@ rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "_rust"
+name = "_core"
 crate-type = ["cdylib"]
 
 [dependencies]

diff --git a/arro3-core/pyproject.toml b/arro3-core/pyproject.toml
@@ -14,7 +14,7 @@ classifiers = [
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
-module-name = "arro3.core._rust"
+module-name = "arro3.core._core"
 python-source = "python"
 
 [tool.poetry]

diff --git a/arro3-core/python/arro3/core/__init__.py b/arro3-core/python/arro3/core/__init__.py
@@ -1,4 +1,4 @@
-from ._rust import (
+from ._core import (
     Array,
     ArrayReader,
     ChunkedArray,

diff --git a/arro3-core/python/arro3/core/_rust.pyi → arro3-core/python/arro3/core/_core.pyi b/arro3-core/python/arro3/core/_rust.pyi → arro3-core/python/arro3/core/_core.pyi
diff --git a/arro3-core/src/lib.rs b/arro3-core/src/lib.rs
@@ -11,7 +11,7 @@ fn ___version() -> &'static str {
 
 /// A Python module implemented in Rust.
 #[pymodule]
-fn _rust(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
+fn _core(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(___version))?;
 
     m.add_class::<pyo3_arrow::PyArray>()?;

diff --git a/arro3-io/Cargo.toml b/arro3-io/Cargo.toml
@@ -13,7 +13,7 @@ rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "_rust"
+name = "_io"
 crate-type = ["cdylib"]
 
 [dependencies]

diff --git a/arro3-io/pyproject.toml b/arro3-io/pyproject.toml
@@ -14,7 +14,7 @@ classifiers = [
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
-module-name = "arro3.io._rust"
+module-name = "arro3.io._io"
 python-source = "python"
 
 [tool.poetry]

diff --git a/arro3-io/python/arro3/io/__init__.py b/arro3-io/python/arro3/io/__init__.py
@@ -1,4 +1,4 @@
-from ._rust import *
-from ._rust import ___version
+from ._io import *
+from ._io import ___version
 
 __version__: str = ___version()
diff --git a/arro3-io/python/arro3/io/_rust.pyi → arro3-io/python/arro3/io/_io.pyi b/arro3-io/python/arro3/io/_rust.pyi → arro3-io/python/arro3/io/_io.pyi
diff --git a/arro3-io/src/lib.rs b/arro3-io/src/lib.rs
@@ -14,7 +14,7 @@ fn ___version() -> &'static str {
 }
 
 #[pymodule]
-fn _rust(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
+fn _io(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(___version))?;
 
     m.add_wrapped(wrap_pyfunction!(csv::infer_csv_schema))?;

diff --git a/pyo3-arrow/src/array.rs b/pyo3-arrow/src/array.rs
@@ -19,7 +19,7 @@ use crate::PyDataType;
 /// A Python-facing Arrow array.
 ///
 /// This is a wrapper around an [ArrayRef] and a [FieldRef].
-#[pyclass(module = "arro3.core._rust", name = "Array", subclass)]
+#[pyclass(module = "arro3.core._core", name = "Array", subclass)]
 pub struct PyArray {
     array: ArrayRef,
     field: FieldRef,

diff --git a/pyo3-arrow/src/array_reader.rs b/pyo3-arrow/src/array_reader.rs
@@ -17,7 +17,7 @@ use crate::{PyArray, PyChunkedArray, PyField};
 /// A Python-facing Arrow array reader.
 ///
 /// This is a wrapper around a [ArrayReader].
-#[pyclass(module = "arro3.core._rust", name = "ArrayReader", subclass)]
+#[pyclass(module = "arro3.core._core", name = "ArrayReader", subclass)]
 pub struct PyArrayReader(pub(crate) Option<Box<dyn ArrayReader + Send>>);
 
 impl PyArrayReader {

diff --git a/pyo3-arrow/src/chunked.rs b/pyo3-arrow/src/chunked.rs
@@ -21,7 +21,7 @@ use crate::{PyArray, PyDataType};
 /// A Python-facing Arrow chunked array.
 ///
 /// This is a wrapper around a [FieldRef] and a `Vec` of [ArrayRef].
-#[pyclass(module = "arro3.core._rust", name = "ChunkedArray", subclass)]
+#[pyclass(module = "arro3.core._core", name = "ChunkedArray", subclass)]
 pub struct PyChunkedArray {
     chunks: Vec<ArrayRef>,
     field: FieldRef,

diff --git a/pyo3-arrow/src/datatypes.rs b/pyo3-arrow/src/datatypes.rs
@@ -29,7 +29,7 @@ impl<'a> FromPyObject<'a> for PyTimeUnit {
 }
 
 #[derive(PartialEq, Eq, Debug)]
-#[pyclass(module = "arro3.core._rust", name = "DataType", subclass)]
+#[pyclass(module = "arro3.core._core", name = "DataType", subclass)]
 pub struct PyDataType(DataType);
 
 impl PyDataType {

diff --git a/pyo3-arrow/src/field.rs b/pyo3-arrow/src/field.rs
@@ -18,7 +18,7 @@ use crate::PyDataType;
 /// A Python-facing Arrow field.
 ///
 /// This is a wrapper around a [FieldRef].
-#[pyclass(module = "arro3.core._rust", name = "Field", subclass)]
+#[pyclass(module = "arro3.core._core", name = "Field", subclass)]
 pub struct PyField(FieldRef);
 
 impl PyField {

diff --git a/pyo3-arrow/src/record_batch.rs b/pyo3-arrow/src/record_batch.rs
@@ -21,7 +21,7 @@ use crate::{PyArray, PyField, PySchema};
 /// A Python-facing Arrow record batch.
 ///
 /// This is a wrapper around a [RecordBatch].
-#[pyclass(module = "arro3.core._rust", name = "RecordBatch", subclass)]
+#[pyclass(module = "arro3.core._core", name = "RecordBatch", subclass)]
 #[derive(Debug)]
 pub struct PyRecordBatch(RecordBatch);
 

diff --git a/pyo3-arrow/src/record_batch_reader.rs b/pyo3-arrow/src/record_batch_reader.rs
@@ -19,7 +19,7 @@ use crate::{PyRecordBatch, PySchema, PyTable};
 /// A Python-facing Arrow record batch reader.
 ///
 /// This is a wrapper around a [RecordBatchReader].
-#[pyclass(module = "arro3.core._rust", name = "RecordBatchReader", subclass)]
+#[pyclass(module = "arro3.core._core", name = "RecordBatchReader", subclass)]
 pub struct PyRecordBatchReader(pub(crate) Option<Box<dyn RecordBatchReader + Send>>);
 
 impl PyRecordBatchReader {

diff --git a/pyo3-arrow/src/schema.rs b/pyo3-arrow/src/schema.rs
@@ -18,7 +18,7 @@ use crate::{PyDataType, PyField, PyTable};
 /// A Python-facing Arrow schema.
 ///
 /// This is a wrapper around a [SchemaRef].
-#[pyclass(module = "arro3.core._rust", name = "Schema", subclass)]
+#[pyclass(module = "arro3.core._core", name = "Schema", subclass)]
 pub struct PySchema(SchemaRef);
 
 impl PySchema {

diff --git a/pyo3-arrow/src/table.rs b/pyo3-arrow/src/table.rs
@@ -23,7 +23,7 @@ use crate::{PyChunkedArray, PyField, PyRecordBatch, PyRecordBatchReader, PySchem
 /// A Python-facing Arrow table.
 ///
 /// This is a wrapper around a [SchemaRef] and a `Vec` of [RecordBatch].
-#[pyclass(module = "arro3.core._rust", name = "Table", subclass)]
+#[pyclass(module = "arro3.core._core", name = "Table", subclass)]
 #[derive(Debug)]
 pub struct PyTable {
     batches: Vec<RecordBatch>,