Skip to content

Commit

Permalink
Merge #1343
Browse files Browse the repository at this point in the history
1343: Fix sdist when all Cargo workspace members are excluded r=messense a=messense

Fixes `ruff` conda build

> Error: `cargo metadata` exited with an error: error: failed to load manifest for workspace member `/home/conda/feedstock_root/build_artifacts/ruff_1670398792519/work/flake8_to_ruff`

https://dev.azure.com/conda-forge/feedstock-builds/_build/results?buildId=624474&view=logs&j=4f922444-fdfe-5dcf-b824-02f86439ef14&t=b2a8456a-fb11-5506-ca32-5ccd32538dc0

Co-authored-by: messense <[email protected]>
  • Loading branch information
bors[bot] and messense authored Dec 7, 2022
2 parents 82aa66a + 630c4c7 commit dcb9087
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* **Breaking Change**: Remove deprecated `python-source` option in `Cargo.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
* **Breaking Change**: Turn `patchelf` version warning into a hard error in [#1335](https://github.com/PyO3/maturin/pull/1335)
* Support `SOURCE_DATE_EPOCH` when building wheels in [#1334](https://github.com/PyO3/maturin/pull/1334)
* Fix sdist when all Cargo workspace members are excluded in [#1343](https://github.com/PyO3/maturin/pull/1343)

## [0.14.4] - 2022-12-05

Expand Down
4 changes: 3 additions & 1 deletion src/source_distribution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,10 @@ fn rewrite_cargo_toml(
}
if !new_members.is_empty() {
workspace["members"] = toml_edit::value(new_members);
rewritten = true;
} else {
workspace.remove("members");
}
rewritten = true;
}
}
}
Expand Down

0 comments on commit dcb9087

Please sign in to comment.