Allow discovery of x86-64 managed Python builds on macOS #13474
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1416,3 +1416,73 @@ fn python_install_cached() { | |
| Caused by: An offline Python installation was requested, but cpython-3.12.10[DATE]-[PLATFORM].tar.gz) is missing in python-cache | ||
| "); | ||
| } | ||
|
|
||
| #[cfg(target_os = "macos")] | ||
| #[test] | ||
| fn python_install_emulated_macos() { | ||
| let context: TestContext = TestContext::new_with_versions(&[]) | ||
| .with_filtered_exe_suffix() | ||
| .with_managed_python_dirs(); | ||
|
|
||
| // Before installation, `uv python list` should not show the x86_64 download | ||
| uv_snapshot!(context.filters(), context.python_list().arg("3.13"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
| cpython-3.13.3-macos-aarch64-none <download available> | ||
|
|
||
| ----- stderr ----- | ||
| "); | ||
|
|
||
| // Install an x86_64 version (assuming an aarch64 host) | ||
| uv_snapshot!(context.filters(), context.python_install().arg("cpython-3.13-macos-x86_64"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
|
|
||
| ----- stderr ----- | ||
| Installed Python 3.13.3 in [TIME] | ||
| + cpython-3.13.3-macos-x86_64-none | ||
| "); | ||
|
|
||
| // It should be discoverable with `uv python find` | ||
| uv_snapshot!(context.filters(), context.python_find().arg("3.13"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
| [TEMP_DIR]/managed/cpython-3.13.3-macos-x86_64-none/bin/python3.13 | ||
|
|
||
| ----- stderr ----- | ||
| "); | ||
|
|
||
| // And included in `uv python list` | ||
| uv_snapshot!(context.filters(), context.python_list().arg("3.13"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
| cpython-3.13.3-macos-x86_64-none managed/cpython-3.13.3-macos-x86_64-none/bin/python3.13 | ||
| cpython-3.13.3-macos-aarch64-none <download available> | ||
|
|
||
| ----- stderr ----- | ||
| "); | ||
|
|
||
| uv_snapshot!(context.filters(), context.python_install().arg("cpython-3.13-macos-aarch64"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
|
|
||
| ----- stderr ----- | ||
| Installed Python 3.13.3 in [TIME] | ||
| + cpython-3.13.3-macos-aarch64-none | ||
| "); | ||
|
|
||
| // Once we've installed the native version, it should be preferred over x86_64 | ||
| uv_snapshot!(context.filters(), context.python_find().arg("3.13"), @r" | ||
| success: true | ||
| exit_code: 0 | ||
| ----- stdout ----- | ||
| [TEMP_DIR]/managed/cpython-3.13.3-macos-x86_64-none/bin/python3.13 | ||
|
Member
Author
There was a problem hiding this comment. Unfortunately this is wrong. We'll need to change the ordering of the managed distributions per target platform so we prefer the native builds.
Member
Author
There was a problem hiding this comment. I think this hints at a different design for #13701
Member
Author
|
||
|
|
||
| ----- stderr ----- | ||
| "); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will note that isn't actually strictly true for macOS: Rosetta2 is not default-installed on Apple Silicon macOS. It is auto-installed the first time you run an intel app... but only if it's a full GUI App. If it's just a random CLI binary it actually won't bother!
So if we want to be fully bullet-proof we would have to check if Rosetta2 is already on the user's system :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In practice it tends to be fine though. Especially since we're finding these things on their system.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh dear goodness. That's... good to know. I will at least add some commentary about that.