diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6263bcf7b..dd4654607 100644 --- 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 index 0ea82570a..7debaca62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -703,9 +703,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.12" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bf8df95e795db1a4aca2957ad884a2df35413b24bbeb3114422f3cc21498e8" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", @@ -716,9 +716,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422f23e724af1240ec469ea1e834d87a4b59ce2efe2c6a96256b0c47e2fd86aa" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -2473,9 +2473,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", diff --git a/Changelog.md b/Changelog.md index 889855bad..186c6ba34 100644 --- 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 index 241e9a6dc..f4807a2bb 100644 --- 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 index d40d11ed6..be3988271 100644 --- 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, }, } @@ -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()