Skip to content

Commit

Permalink
Merge pull request #630 from messense/windows-py-3-10
Browse files Browse the repository at this point in the history
Auto discover Python 3.10 and later on Windows
  • Loading branch information
messense authored Sep 19, 2021
2 parents 971f0de + ccd85a2 commit 52e5d52
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Autodetect PyPy executables in [#617](https://github.com/PyO3/maturin/pull/617)
* auditwheel: add `libz.so.1` to whitelisted libraries in [#625](https://github.com/PyO3/maturin/pull/625)
* auditwheel: detect musl libc in [#629](https://github.com/PyO3/maturin/pull/629)
* Fixed Python 3.10 and later versions detection on Windows in [#630](https://github.com/PyO3/maturin/pull/630)

## [0.11.3] - 2021-08-25

Expand Down
2 changes: 1 addition & 1 deletion src/python_interpreter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fn find_all_windows(target: &Target, min_python_minor: usize) -> Result<Vec<Stri
// which is used to find the installed interpreters
let execution = Command::new("py").arg("-0").output();
if let Ok(output) = execution {
let expr = Regex::new(r" -(\d).(\d)-(\d+)(?: .*)?").unwrap();
let expr = Regex::new(r" -(\d).(\d+)-(\d+)(?: .*)?").unwrap();
let lines = str::from_utf8(&output.stdout).unwrap().lines();
for line in lines {
if let Some(capture) = expr.captures(line) {
Expand Down

0 comments on commit 52e5d52

Please sign in to comment.