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

Jump to bottom

Restore computing version in legacy locators #23596

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Restore computing version in legacy locators #23596

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
6 changes: 3 additions & 3 deletions src/client/pythonEnvironments/base/locators/composite/resolverUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ async function resolveGloballyInstalledEnv(env: BasicEnvInfo): Promise<PythonEnv
const { executablePath } = env;
let version;
try {
version = env.version ?? parseVersionFromExecutable(executablePath);
version = parseVersionFromExecutable(executablePath);
} catch {
version = UNKNOWN_PYTHON_VERSION;
}
Expand All @@ -170,7 +170,7 @@ async function resolveSimpleEnv(env: BasicEnvInfo): Promise<PythonEnvInfo> {
const { executablePath, kind } = env;
const envInfo = buildEnvInfo({
kind,
version: env.version ?? (await getPythonVersionFromPath(executablePath)),
version: await getPythonVersionFromPath(executablePath),
executable: executablePath,
sysPrefix: env.envPath,
location: env.envPath,
Expand Down Expand Up @@ -243,7 +243,7 @@ async function resolveCondaEnv(env: BasicEnvInfo): Promise<PythonEnvInfo> {
} else {
executable = await conda.getInterpreterPathForEnvironment({ prefix: envPath });
}
const version = env.version ?? (executable ? await getPythonVersionFromPath(executable) : undefined);
const version = executable ? await getPythonVersionFromPath(executable) : undefined;
const info = buildEnvInfo({
executable,
kind: PythonEnvKind.Conda,
Expand Down
Loading