-
Notifications
You must be signed in to change notification settings - Fork 28
feat(python): auto-activate venv before hook execution #347
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mwbrooks
wants to merge
7
commits into
mwbrooks-python-venv
Choose a base branch
from
mwbrooks-python-venv-activation
base: mwbrooks-python-venv
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fdd8e15
feat(python): auto-activate venv before hook execution
mwbrooks 253ee65
Merge branch 'mwbrooks-python-venv' into mwbrooks-python-venv-activation
mwbrooks adbda1b
feat(python): log debug message when venv is activated
mwbrooks 91a07bf
refactor(python): use Os interface in ActivateVenvIfPresent for testa…
mwbrooks b75edb9
test: add tests for ActivatePythonVenvIfPresent in runtime package
mwbrooks ce15297
test: remove test comment
mwbrooks f8755c9
fix: merge variable declaration with assignment to satisfy linter
mwbrooks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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 |
|---|---|---|
|
|
@@ -224,6 +224,14 @@ func (c *ClientFactory) InitSDKConfig(ctx context.Context, dirPath string) error | |
| // Move upward one directory level | ||
| dirPath = filepath.Dir(dirPath) | ||
| } | ||
| // Activate Python virtual environment if present, so hook scripts | ||
| // can resolve the venv's Python and installed packages. | ||
| if activated, err := runtime.ActivatePythonVenvIfPresent(c.Fs, c.Os, dirPath); err != nil { | ||
| c.IO.PrintDebug(ctx, "failed to activate Python virtual environment: %s", err) | ||
| } else if activated { | ||
| c.IO.PrintDebug(ctx, "Activated Python virtual environment .venv") | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. note: I'd love to display this in the regular output, but it's tough to get a nice format because it can be displayed in many different situations. |
||
| } | ||
|
|
||
| configFileBytes, err := afero.ReadFile(c.Fs, hooksJSONFilePath) | ||
| if err != nil { | ||
| return err // Fixes regression: do not wrap this error, so that the caller can use `os.IsNotExists` | ||
|
|
||
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
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
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.
note: While it feels wrong to have Python in the generic
runtimethis allows us to activate it for any project. We could move this into the Python runtime and think of a more general function that could be used across all runtimes.Upside of this approach is that JS projects that include a
.venv(perhaps for scripts) can be activated automatically.