Skip to content

If a conda environment is not returned via the conda env list command, resolve it as unknown #18856

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 3 commits into from
Apr 4, 2022
Merged

If a conda environment is not returned via the conda env list command, resolve it as unknown #18856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26b330c
If a conda environment is not returned via the conda env list command…
Apr 4, 2022
96c0760
News entry
Apr 4, 2022
6a24a3c
Fix unit tests
Apr 4, 2022
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 news/2 Fixes/18530.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
If a conda environment is not returned via the `conda env list` command, consider it as unknown env type.
1 change: 1 addition & 0 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 @@ -173,6 +173,7 @@ async function resolveCondaEnv(env: BasicEnvInfo, useCache?: boolean): Promise<P
} info' command`,
);
// Environment could still be valid, resolve as a simple env.
env.kind = PythonEnvKind.Unknown;
return resolveSimpleEnv(env);
}

Expand Down
8 changes: 4 additions & 4 deletions src/test/pythonEnvironments/base/locators/composite/resolverUtils.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ suite('Resolver Utils', () => {
);
});

test('resolveEnv: If no conda binary found, resolve as a simple environment', async () => {
test('resolveEnv: If no conda binary found, resolve as an unknown environment', async () => {
sinon.stub(platformApis, 'getOSType').callsFake(() => platformApis.OSType.Windows);
sinon.stub(externalDependencies, 'shellExecute').callsFake(async (command: string) => {
throw new Error(`${command} is missing or is not executable`);
Expand All @@ -293,7 +293,7 @@ suite('Resolver Utils', () => {
actual,
createSimpleEnvInfo(
path.join(TEST_LAYOUT_ROOT, 'conda1', 'python.exe'),
PythonEnvKind.Conda,
PythonEnvKind.Unknown,
undefined,
'conda1',
path.join(TEST_LAYOUT_ROOT, 'conda1'),
Expand Down Expand Up @@ -616,8 +616,8 @@ suite('Resolver Utils', () => {
});
const expected = buildEnvInfo({
location: path.join(regTestRoot, 'conda3'),
// Environment should already be marked as Conda. No need to update it to Global.
kind: PythonEnvKind.Conda,
// Environment is not marked as Conda, update it to Global.
kind: PythonEnvKind.OtherGlobal,
executable: interpreterPath,
// Registry does not provide the minor version, so keep version provided by Conda resolver instead.
version: parseVersion('3.8.5'),
Expand Down