Merge #1288

1288: Fix generating pep517 sdist for src-layout r=messense a=messense Fixes #1285 Co-authored-by: messense <[email protected]>
PyO3 · Nov 23, 2022 · 41edf7b · 41edf7b
2 parents a0ac5cc + 353b33b
commit 41edf7b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 jobs:
@@ -282,7 +282,7 @@ jobs:
       RUST_BACKTRACE: '1'
       CARGO_INCREMENTAL: '0'
       CARGO_TERM_COLOR: always
-    container: alpine:edge
+    container: alpine:latest
     steps:
       - uses: actions/checkout@v3
       - name: Install build requirements

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Changelog.md b/Changelog.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 * Tighten src-layout detection logic in [#1281](https://github.com/PyO3/maturin/pull/1282)
+* Fix generating pep517 sdist for src-layout in [#1288](https://github.com/PyO3/maturin/pull/1288)
 
 ## [0.14.1] - 2022-11-20
 

diff --git a/src/compile.rs b/src/compile.rs
@@ -10,7 +10,7 @@ use std::io::{BufReader, Read};
 use std::path::{Path, PathBuf};
 use std::process::Stdio;
 use std::str;
-use tracing::debug;
+use tracing::{debug, trace};
 
 /// The first version of pyo3 that supports building Windows abi3 wheel
 /// without `PYO3_NO_PYTHON` environment variable
@@ -425,7 +425,7 @@ fn compile_target(
         .expect("Cargo build should have a stdout");
     for message in cargo_metadata::Message::parse_stream(BufReader::new(stream)) {
         let message = message.context("Failed to parse cargo metadata message")?;
-        debug!("cargo message: {:?}", message);
+        trace!("cargo message: {:?}", message);
         match message {
             cargo_metadata::Message::CompilerArtifact(artifact) => {
                 let package_in_metadata = context

diff --git a/src/main.rs b/src/main.rs
@@ -197,14 +197,9 @@ enum Pep517Command {
         /// The sdist_directory argument to build_sdist
         #[arg(long = "sdist-directory")]
         sdist_directory: PathBuf,
-        #[arg(
-            short = 'm',
-            long = "manifest-path",
-            default_value = "Cargo.toml",
-            value_name = "PATH"
-        )]
+        #[arg(short = 'm', long = "manifest-path", value_name = "PATH")]
         /// The path to the Cargo.toml
-        manifest_path: PathBuf,
+        manifest_path: Option<PathBuf>,
     },
 }
 
@@ -292,7 +287,7 @@ fn pep517(subcommand: Pep517Command) -> Result<()> {
             let build_options = BuildOptions {
                 out: Some(sdist_directory),
                 cargo: CargoOptions {
-                    manifest_path: Some(manifest_path),
+                    manifest_path,
                     ..Default::default()
                 },
                 ..Default::default()