Get activate env vars for non-conda as well #9163
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
DonJayamanne
commented
Mar 1, 2022
| @@ -51,7 +51,7 @@ export class KernelEnvironmentVariablesService { | |||
|
|
|||
| let [customEditVars, interpreterEnv] = await Promise.all([ | |||
| this.customEnvVars.getCustomEnvironmentVariables(resource).catch(noop), | |||
| interpreter && interpreter.envType == EnvironmentType.Conda | |||
There was a problem hiding this comment.
This was wrong, we should get activated env variables for Virtual Env, etc, not just Conda environments.
There was a problem hiding this comment.
This will work for virtual environments
DonJayamanne
commented
Mar 1, 2022
| if (interpreter) { | ||
| const env = kernelEnv || process.env; | ||
| this.envVarsService.prependPath(env, path.dirname(interpreter.path)); | ||
| return env; |
There was a problem hiding this comment.
Fall back, if we do'nt have any env variables, then prefix PATH as we do in other cases.
There was a problem hiding this comment.
This will work for global interpreters
rchiodo
approved these changes
Mar 1, 2022
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.
Fixes #9089