Skip to content

Commit

Permalink
Merge pull request #1443 from messense/release-0.14.12
Browse files Browse the repository at this point in the history
Release 0.14.12
  • Loading branch information
messense authored Jan 31, 2023
2 parents accefcf + a67a18e commit c2a79db
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ jobs:
test-bootstrap:
name: Test Bootstrap
if: github.event_name != 'pull_request'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
Expand Down Expand Up @@ -441,9 +440,8 @@ jobs:
shell: bash
run: |
set -ex
pip install build
python3 -m build --wheel -o dist
pip install dist/maturin*.whl
cargo run sdist -o dist
pip install -v dist/maturin-*.tar.gz
if: steps.changes.outputs.changed == 'true'
- run: maturin --version
if: steps.changes.outputs.changed == 'true'
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["konstin <[email protected]>", "messense <[email protected]>"]
name = "maturin"
version = "0.14.11"
version = "0.14.12"
description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages"
exclude = ["test-crates/**/*", "sysconfig/*", "test-data/*", "ci/*", "tests/*", "guide/*", ".github/*"]
homepage = "https://github.com/pyo3/maturin"
Expand Down
7 changes: 6 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.14.12] - 2023-01-31

* Keep `dev-dependencies` in sdist when there are no path dependencies in [#1441](https://github.com/PyO3/maturin/pull/1441)

## [0.14.11] - 2023-01-31

* Don't package dev-only path dependencies in sdist in [#1435](https://github.com/PyO3/maturin/pull/1435)
Expand Down Expand Up @@ -803,7 +807,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/v0.14.11...HEAD
[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.12...HEAD
[0.14.12]: https://github.com/pyo3/maturin/compare/v0.14.11...v0.14.12
[0.14.11]: https://github.com/pyo3/maturin/compare/v0.14.10...v0.14.11
[0.14.10]: https://github.com/pyo3/maturin/compare/v0.14.9...v0.14.10
[0.14.9]: https://github.com/pyo3/maturin/compare/v0.14.8...v0.14.9
Expand Down
6 changes: 4 additions & 2 deletions src/source_distribution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ fn rewrite_cargo_toml(
// ^^^^^^^^^^^^^ dep_name
for dep_category in ["dependencies", "dev-dependencies", "build-dependencies"] {
if let Some(table) = data.get_mut(dep_category).and_then(|x| x.as_table_mut()) {
if dep_category == "dev-dependencies" {
// Remove dev-dependencies since building from sdist doesn't need them
if dep_category == "dev-dependencies" && !known_path_deps.is_empty() {
// Remove dev-dependencies since building from sdist doesn't need them,
// Keep it when there are no path dependencies to support building from
// sdist with `--locked`/`--frozen`.
data.remove(dep_category);
rewritten = true;
continue;
Expand Down

0 comments on commit c2a79db

Please sign in to comment.