Skip to content

Ensure virtual environment created using python -m venv . is recognized #19543

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
karrtikr merged 3 commits into from
Jul 25, 2022
Merged

Ensure virtual environment created using python -m venv . is recognized #19543

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
efc2f9c
Set searchLocation for environments as the location of environment fo…
Jul 25, 2022
37ca955
Fix tests
Jul 25, 2022
803a866
Modify comment
Jul 25, 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
10 changes: 4 additions & 6 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 @@ -70,15 +70,13 @@ function getSearchLocation(env: PythonEnvInfo): Uri | undefined {
const isRootedEnv = folders.some((f) => isParentPath(env.executable.filename, f));
if (isRootedEnv) {
// For environments inside roots, we need to set search location so they can be queried accordingly.
// Search location particularly for virtual environments is intended as the directory in which the
// environment was found in.
// For eg.the default search location for an env containing 'bin' or 'Scripts' directory is:
// In certain usecases environment directory can itself be a root, for eg. `python -m venv .`.
// So choose folder to environment path to search for this env.
//
// searchLocation <--- Default search location directory
// |__ env
// |__ env <--- Default search location directory
// |__ bin or Scripts
// |__ python <--- executable
return Uri.file(path.dirname(env.location));
return Uri.file(env.location);
}
return undefined;
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/pythonEnvironments/base/locators/composite/envsResolver.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ suite('Python envs locator - Environments Resolver', () => {
version,
arch: Architecture.Unknown,
distro: { org: '' },
searchLocation: Uri.file(path.dirname(location)),
searchLocation: Uri.file(location),
source: [],
};
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -331,7 +331,7 @@ suite('Resolver Utils', () => {
version,
arch: Architecture.Unknown,
distro: { org: '' },
searchLocation: Uri.file(path.dirname(location)),
searchLocation: Uri.file(location),
source: [],
};
setEnvDisplayString(info);
Expand Down