Skip to content

Commit

Permalink
Revert "Temp work around for not being able to install Ipykernel in c…
Browse files Browse the repository at this point in the history
…ontainers"

This reverts commit 9aa2ae6.
  • Loading branch information
DonJayamanne committed Aug 2, 2021
1 parent 7314781 commit 3fe7f05
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions src/client/api/pythonApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
// Licensed under the MIT License.

import { inject, injectable, named } from 'inversify';
import { CancellationToken, Disposable, env, Event, EventEmitter, Memento, Uri } from 'vscode';
import { CancellationToken, Disposable, Event, EventEmitter, Memento, Uri } from 'vscode';
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../common/application/types';
import { trackPackageInstalledIntoInterpreter } from '../common/installer/productInstaller';
import { ProductNames } from '../common/installer/productNames';
import { InterpreterUri } from '../common/installer/types';
import { traceWarning } from '../common/logger';
import {
GLOBAL_MEMENTO,
IDisposableRegistry,
Expand Down Expand Up @@ -247,15 +246,6 @@ export class PythonInstaller implements IPythonInstaller {
this.interpreterPackages.trackPackages(resource);
}
let action: 'installed' | 'failed' | 'disabled' | 'ignored' = 'installed';
if (env.remoteName && reInstallAndUpdate) {
// Temporary work around for https://github.com/microsoft/vscode-jupyter/issues/6896
traceWarning(
`Disabling -U and flag when installing Dependencies in containers for ${ProductNames.get(product)} in ${
isResource(resource) ? resource?.fsPath : resource.path
}`
);
reInstallAndUpdate = false;
}
try {
const api = await this.apiProvider.getApi();
const result = await api.install(ProductMapping[product], resource, cancel, reInstallAndUpdate);
Expand Down

0 comments on commit 3fe7f05

Please sign in to comment.