Skip to content

When starting Jupyter activate conda env #9972

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 7, 2020
Merged

When starting Jupyter activate conda env #9972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
519e2e8
If interpreter is provided use that to check if is conda environment
DonJayamanne Feb 6, 2020
588a13f
Fix tests
DonJayamanne Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/common/terminal/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class TerminalHelper implements ITerminalHelper {
}

// If we have a conda environment, then use that.
const isCondaEnvironment = await this.condaService.isCondaEnvironment(settings.pythonPath);
const isCondaEnvironment = interpreter ? interpreter.type === InterpreterType.Conda : await this.condaService.isCondaEnvironment(settings.pythonPath);
if (isCondaEnvironment) {
const activationCommands = interpreter
? await this.conda.getActivationCommandsForInterpreter(interpreter.path, terminalShellType)
Expand Down
4 changes: 2 additions & 2 deletions src/test/common/terminals/helper.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ suite('Terminal Service helpers', () => {

expect(cmd).to.equal(undefined, 'Command must be undefined');
verify(pythonSettings.terminal).once();
verify(pythonSettings.pythonPath).once();
verify(condaService.isCondaEnvironment(pythonPath)).once();
verify(pythonSettings.pythonPath).times(interpreter ? 0 : 1);
verify(condaService.isCondaEnvironment(pythonPath)).times(interpreter ? 0 : 1);
verify(bashActivationProvider.isShellSupported(shellToExpect)).atLeast(1);
verify(pyenvActivationProvider.isShellSupported(anything())).never();
verify(pipenvActivationProvider.isShellSupported(anything())).never();
Expand Down