Fix finding Python within virtualenv on Windows #2034
Merged
Conversation
This file contains 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
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
force-pushed
the
DECO-24194--fix-venv-windows
branch
from
a1fc119 to
7fbd9fe
Compare
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
force-pushed
the
DECO-24194--fix-venv-windows
branch
from
7fbd9fe to
3c3c172
Compare
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
pietern
reviewed
Dec 19, 2024
libs/python/detect.go
Outdated
|
|
||
| // On Windows when virtualenv is created, the <env>/Scripts directory | ||
| // contains python.exe but no python3.exe. However, system python does have python3 entry | ||
| // and it is also added to PATH, so it is found first. |
There was a problem hiding this comment.
Could this regress the non-venv cases where python.exe resolves to a system-wide Python 2 installation?
There was a problem hiding this comment.
Maybe, if they somehow managed to have Python2 installed in the first place, but why would they have that?
There was a problem hiding this comment.
I see python3 mentioned in another place in this module - it also won't work.
There was a problem hiding this comment.
Does it matter which Windows terminal is being used? Some users might use Git Bash for example and maybe the behaviour is different?
There was a problem hiding this comment.
that should not matter
| ) | ||
|
|
||
| func TestVenv(t *testing.T) { | ||
| // Test at least two version to ensure we capture a case where venv version does not match system one |
this new function does not change chdir or sets environment
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
|
Test Details: go/deco-tests/12409928666 |
libs/python/detect.go
Outdated
|
|
||
| // On Windows when virtualenv is created, the <env>/Scripts directory | ||
| // contains python.exe but no python3.exe. However, system python does have python3 entry | ||
| // and it is also added to PATH, so it is found first. |
There was a problem hiding this comment.
Does it matter which Windows terminal is being used? Some users might use Git Bash for example and maybe the behaviour is different?
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
|
If integration tests don't run automatically, an authorized user can run them manually by following the instructions below: Trigger: Inputs:
Checks will be approved automatically on success. |
pietern
approved these changes
Dec 20, 2024
pietern
added a commit
that referenced
this pull request
Jan 8, 2025
Bundles: * Fix finding Python within virtualenv on Windows ([#2034](#2034)). * Include missing field descriptions in JSON schema ([#2045](#2045)). * Add validation for volume referenced from `artifact_path` ([#2050](#2050)). * Handle `${workspace.file_path}` references in source-linked deployments ([#2046](#2046)). * Set the write bit for files written during template initialization ([#2068](#2068)).
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 8, 2025
Bundles: * Fix finding Python within virtualenv on Windows ([#2034](#2034)). * Include missing field descriptions in JSON schema ([#2045](#2045)). * Add validation for volume referenced from `artifact_path` ([#2050](#2050)). * Handle `${workspace.file_path}` references in source-linked deployments ([#2046](#2046)). * Set the write bit for files written during template initialization ([#2068](#2068)).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
Simplify logic for selecting Python to run when calculating default whl build command: "python" on Windows and "python3" everywhere.
Python installers from python.org do not install python3.exe. In virtualenv there is no python3.exe.
Tests
Added new unit tests to create real venv with uv and simulate activation by prepending venv/bin to PATH.