Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@vscode:registry=https://pkgs.dev.azure.com/azure-public/vside/_packaging/python-environments/npm/registry/
# Force public npm registry to avoid CI auth (E401) when no token is provided
registry=https://registry.npmjs.org/
# Do not require auth for public installs
Expand Down
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
]
},
"dependencies": {
"@vscode/python-environments": "^1.0.0",
"@vscode/python-extension": "^1.0.6",
"fs-extra": "^11.3.1",
"minimatch": "^10.2.4",
Expand Down
29 changes: 7 additions & 22 deletions src/common/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Licensed under the MIT License.

/* eslint-disable @typescript-eslint/naming-convention */
import { commands, Disposable, Event, EventEmitter, extensions, Uri } from 'vscode';
import { PythonEnvironmentApi, PythonEnvironment, PythonEnvironments } from '@vscode/python-environments';
import { commands, Disposable, Event, EventEmitter, Uri } from 'vscode';
import { traceError, traceLog } from './logging';
import { PythonExtension, ResolvedEnvironment } from '@vscode/python-extension';
import * as semver from 'semver';
import type { PythonEnvironment, PythonEnvironmentsAPI } from '../typings/pythonEnvironments';
import { PYTHON_MAJOR, PYTHON_MINOR, PYTHON_VERSION } from './constants';
import { getProjectRoot } from './utilities';

Expand Down Expand Up @@ -56,32 +56,17 @@ async function getPythonExtensionAPI(): Promise<PythonExtension | undefined> {
return _api;
}

const PYTHON_ENVIRONMENTS_EXTENSION_ID = 'ms-python.vscode-python-envs';

let _envsApi: PythonEnvironmentsAPI | undefined;
async function getEnvironmentsExtensionAPI(): Promise<PythonEnvironmentsAPI | undefined> {
let _envsApi: PythonEnvironmentApi | undefined;
async function getEnvironmentsExtensionAPI(): Promise<PythonEnvironmentApi | undefined> {
if (_envsApi) {
return _envsApi;
}
const extension = extensions.getExtension(PYTHON_ENVIRONMENTS_EXTENSION_ID);
if (!extension) {
return undefined;
}
try {
if (!extension.isActive) {
await extension.activate();
}
const api = extension.exports;
if (!api) {
traceError('Python environments extension did not provide any exports.');
return undefined;
}
_envsApi = api as PythonEnvironmentsAPI;
return _envsApi;
} catch (ex) {
traceError('Failed to activate or retrieve API from Python environments extension.', ex as Error);
_envsApi = await PythonEnvironments.api();
} catch {
return undefined;
}
return _envsApi;
}

function sameInterpreter(a: string[], b: string[]): boolean {
Expand Down
50 changes: 0 additions & 50 deletions src/typings/pythonEnvironments.d.ts

This file was deleted.

Loading