Move objects to crates/

castedo · Feb 10, 2024 · d208893 · d208893
1 parent 4832e1b
commit d208893
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ docs/api/*.txt
 .eggs
 dulwich.dist-info
 .stestr
+target/
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,2 @@
-[package]
-name = "objects-py"
-version = "3.4.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib"]
-path = "dulwich/_objects.rs"
-
-[dependencies]
-pyo3 = { version = ">=0.19", features = ["extension-module"]}
-memchr = "2"
+[workspace]
+members = ["crates/*"]
diff --git a/crates/objects/Cargo.toml b/crates/objects/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "objects-py"
+version = "3.4.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+pyo3 = { version = ">=0.19", features = ["extension-module"]}
+memchr = "2"
diff --git a/dulwich/_objects.rs → crates/objects/src/lib.rs b/dulwich/_objects.rs → crates/objects/src/lib.rs
diff --git a/crates/pack/Cargo.toml b/crates/pack/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "pack-py"
+version = "3.4.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+path = "dulwich/_pack.rs"
+
+[dependencies]
+pyo3 = { version = ">=0.19", features = ["extension-module"]}
+memchr = "2"
diff --git a/setup.py b/setup.py
@@ -40,15 +40,18 @@
     Extension("dulwich._diff_tree", ["dulwich/_diff_tree.c"], optional=optional),
 ]
 
+rust_extensions = [
+    RustExtension("dulwich._objects", "crates/objects/Cargo.toml", binding=Binding.PyO3, optional = True),
+]
+
 # Ideally, setuptools would just provide a way to do this
 if "--pure" in sys.argv:
     sys.argv.remove("--pure")
     ext_modules = []
+    rust_extensions = []
 
 
-setup(
-    package_data={"": ["../docs/tutorial/*.txt", "py.typed"]},
-    rust_extensions=[RustExtension("dulwich._objects", "Cargo.toml", binding=Binding.PyO3, optional = True)],
-    ext_modules=ext_modules,
-    tests_require=tests_require,
-)
+setup(package_data={'': ['../docs/tutorial/*.txt', 'py.typed']},
+      ext_modules=ext_modules,
+      rust_extensions=rust_extensions,
+      tests_require=tests_require)
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,4 @@ docs/api/*.txt @@
     .eggs
     dulwich.dist-info
     .stestr
+    target/