Skip to content
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

Revert work around for not being able to install ipykernel #6952

Merged
merged 1 commit into from
Aug 3, 2021
Merged

Revert work around for not being able to install ipykernel #6952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions src/client/api/pythonApi.ts
View file
Open in desktop
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(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the bug still active? Wondering how we make sure to fix this for real before next release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bug is active & moved to Python repo, microsoft/vscode-python#16851
We cannot add a work around at our end.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverting as the work around doesn't fix it (i thought it did, but was wrong).

`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