Don't package non-path-dep crates in sdist for workspaces

Author: messense

Changelog.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 * Add a `maturin init` command as a companion to `maturin new` in [#719](https://github.com/PyO3/maturin/pull/719)
+* Don't package non-path-dep crates in sdist for workspaces in [#720](https://github.com/PyO3/maturin/pull/720)
 
 ## [0.12.3] - 2021-11-29
 

src/source_distribution.rs

@@ -178,15 +178,22 @@ pub fn source_distribution(
         .resolve
         .as_ref()
         .context("Expected to get a dependency graph from cargo")?;
-    let known_path_deps: HashMap<String, PathBuf> = resolve
+    let root = resolve
+        .root
+        .as_ref()
+        .context("Expected to get a root package id of dependency graph from cargo")?;
+    let root_node = resolve
         .nodes
         .iter()
-        .filter(|node| {
-            &node.id != resolve.root.as_ref().unwrap() && node.id.repr.contains("path+file://")
-        })
+        .find(|node| &node.id == root)
+        .context("Expected to get a root node of dependency graph from cargo")?;
+    let known_path_deps: HashMap<String, PathBuf> = root_node
+        .deps
+        .iter()
+        .filter(|node| node.pkg.repr.contains("path+file://"))
         .filter_map(|node| {
             cargo_metadata.packages.iter().find_map(|pkg| {
-                if pkg.id.repr == node.id.repr {
+                if pkg.id.repr == node.pkg.repr {
                     Some((pkg.name.clone(), PathBuf::from(&pkg.manifest_path)))
                 } else {
                     None

test-crates/workspace_path_dep/Cargo.lock

@@ -0,0 +1,6 @@
+[workspace]
+members = [
+  "generic_lib",
+  "dont_include_in_sdist",
+  "python"
+]

test-crates/workspace_path_dep/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "dont_include_in_sdist"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

test-crates/workspace_path_dep/dont_include_in_sdist/Cargo.toml

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

test-crates/workspace_path_dep/dont_include_in_sdist/src/main.rs

@@ -0,0 +1,8 @@
+[package]
+name = "generic_lib"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

test-crates/workspace_path_dep/generic_lib/Cargo.toml

@@ -0,0 +1,8 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        let result = 2 + 2;
+        assert_eq!(result, 4);
+    }
+}

test-crates/workspace_path_dep/generic_lib/src/lib.rs

@@ -0,0 +1,13 @@
+[package]
+name = "workspace_with_path_dep"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "python"
+crate-type = ["cdylib"]
+
+[dependencies]
+pyo3 = { version = "0.15.1", features = ["extension-module"] }
+generic_lib = { path = "../generic_lib" }

test-crates/workspace_path_dep/python/Cargo.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["maturin>=0.12,<0.13"]
+build-backend = "maturin"

test-crates/workspace_path_dep/python/pyproject.toml

@@ -0,0 +1,15 @@
+
+use pyo3::prelude::*;
+
+/// Formats the sum of two numbers as string.
+#[pyfunction]
+fn sum_as_string(a: usize, b: usize) -> PyResult<String> {
+    Ok((a + b).to_string())
+}
+
+/// A Python module implemented in Rust.
+#[pymodule]
+fn python(_py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(sum_as_string, m)?)?;
+    Ok(())
+}