Merge pull request #112 from uktrade/fix/missing-import-deploy

fix: missing main import
uktrade · Oct 23, 2024 · 13a8d1b · 13a8d1b
2 parents 447d83e + acc2ea4
commit 13a8d1b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "stream_unzip_zipcrypto_decrypt"
+name = "_zipcrypto"
 version = "0.1.0"
 edition = "2021"
 
 [lib]
-name = "stream_unzip_zipcrypto_decrypt"
+name = "_zipcrypto"
 crate-type = ["cdylib"]
 
 [dependencies]

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=0.12,<0.13"]
+requires = ["maturin>=1.7.4,<2.0.0"]
 build-backend = "maturin"
 
 [project]
@@ -38,7 +38,5 @@ ci = [
 "Source" = "https://github.com/uktrade/stream-unzip"
 
 [tool.maturin]
-include = [
-  "stream_unzip.py",
-  "src/**"
-]
+python-source = "python"
+module-name = "stream_unzip._zipcrypto"
diff --git a/stream_unzip.py → python/stream_unzip/__init__.py b/stream_unzip.py → python/stream_unzip/__init__.py
@@ -11,7 +11,7 @@
 
 from stream_inflate import stream_inflate64
 
-from stream_unzip_zipcrypto_decrypt import zipcrypto_decryptor
+from ._zipcrypto import zipcrypto_decryptor
 
 
 NO_ENCRYPTION = object()

diff --git a/src/lib.rs b/src/lib.rs
@@ -82,7 +82,8 @@ impl StreamUnzipZipCryptoDecryptor {
 }
 
 #[pymodule]
-fn stream_unzip_zipcrypto_decrypt(m: &Bound<'_, PyModule>) -> PyResult<()> {
+#[pyo3(name="_zipcrypto")]
+fn zipcrypto(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<StreamUnzipZipCryptoDecryptor>()?;
     Ok(())
 }