Skip to content

Commit

Permalink
Merge #1598
Browse files Browse the repository at this point in the history
1598: Fix finding interpreters from bundled sysconfigs r=messense a=messense

Closes #1597 

Co-authored-by: messense <messense@icloud.com>
  • Loading branch information
bors[bot] and messense authored May 7, 2023
2 parents 742b941 + 4cca6b9 commit d1d9bde
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,9 @@ jobs:
# Test abi3
cargo run --target x86_64-unknown-linux-gnu -- build -i ${{ matrix.platform.python }} --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-pure/Cargo.toml
# --find-interpreter
cargo run --target x86_64-unknown-linux-gnu -- build --find-interpreter --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-mixed/Cargo.toml
test-bootstrap:
name: Test Bootstrap
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

* Fix finding interpreters from bundled sysconfigs in [#1598](https://github.com/PyO3/maturin/pull/1598)

## [0.15.0] - 2023-05-07

* **Breaking Change**: Build with `--no-default-features` by default when bootstrapping from sdist in [#1333](https://github.com/PyO3/maturin/pull/1333)
Expand Down
2 changes: 1 addition & 1 deletion src/python_interpreter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ impl PythonInterpreter {
.filter_map(|config| match requires_python {
Some(requires_python) => {
if requires_python
.contains(&Version::from_release(vec![config.major, config.major]))
.contains(&Version::from_release(vec![config.major, config.minor]))
{
Some(Self::from_config(config))
} else {
Expand Down

0 comments on commit d1d9bde

Please sign in to comment.