Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PyO3/maturin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.2
Choose a base ref
...
head repository: PyO3/maturin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2.3
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 17, 2023

  1. fix: preserve workspace inherited dependencies when building binary 

    fix #1738
    @HerringtonDarkholme
    HerringtonDarkholme committed Aug 17, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c85faa1 View commit details

  2. Merge pull request #1739 from HerringtonDarkholme/fix-workspace-deps 

    fix: preserve workspace inherited dependencies when building binary
    @messense
    messense authored Aug 17, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    698e7cb View commit details

  3. Release v1.2.3

    @messense
    messense committed Aug 17, 2023
    Copy the full SHA
    2e5e51a View commit details
Showing with 15 additions and 3 deletions.
  1. +1 −1 Cargo.lock
  2. +1 −1 Cargo.toml
  3. +6 −1 Changelog.md
  4. +7 −0 src/source_distribution.rs
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
name = "maturin"
version = "1.2.2"
version = "1.2.3"
description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages"
exclude = [
"test-crates/**/*",
7 changes: 6 additions & 1 deletion Changelog.md
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.2.3] - 2023-08-17

* Fix sdist build failure with workspace path dependencies by HerringtonDarkholme in [#1739](https://github.com/PyO3/maturin/pull/1739)

## [1.2.2] - 2023-08-14

* Fix non interactive mode check when username/password was supplied from cli in #[1737](https://github.com/PyO3/maturin/pull/1737)
@@ -903,7 +907,8 @@ points-0.1.0-py2.py3-none-manylinux1_x86_64.whl | 2,8M | 752K | 85K

* Initial Release

[Unreleased]: https://github.com/pyo3/maturin/compare/v1.2.2...HEAD
[Unreleased]: https://github.com/pyo3/maturin/compare/v1.2.3...HEAD
[1.2.3]: https://github.com/pyo3/maturin/compare/v1.2.2...v1.2.3
[1.2.2]: https://github.com/pyo3/maturin/compare/v1.2.1...v1.2.2
[1.2.1]: https://github.com/pyo3/maturin/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/pyo3/maturin/compare/v1.1.0...v1.2.0
7 changes: 7 additions & 0 deletions src/source_distribution.rs
View file
Original file line number Diff line number Diff line change
@@ -294,6 +294,13 @@ fn rewrite_dependencies_path(
// Cargo.toml contains relative paths, and we're already in LOCAL_DEPENDENCIES_FOLDER
toml_edit::value(format!("../{dep_name}"))
};
if workspace_inherit {
// Remove workspace inheritance now that we converted it into a path dependency
dep_table[&dep_name]
.as_table_like_mut()
.unwrap()
.remove("workspace");
}
rewritten = true;
}
}