Add support for detection and selection of conda environments lacking a python interpreter by karrtikr · Pull Request #18427 · microsoft/vscode-python

karrtikr · 2022-02-03T15:17:13Z

Key changes:

ConfigService.pythonPath can now also carry the path to the environment folder. So we remove uses of .pythonPath in favor of using InterpreterService.getActiveInterpreter to get interpreter path instead.
Given interpreter paths are no longer unique, the API has been updated to handle "environments" instead of interpreters.

…mands

…o condawithoutpython

karrtikr · 2022-02-04T08:12:09Z

src/client/common/installer/moduleInstaller.ts

                const interpreter = isResource(resource)
                    ? await interpreterService.getActiveInterpreter(resource)
                    : resource;
-                const pythonPath = isResource(resource) ? settings.pythonPath : resource.path;


.pythonPath can also be path to environment, so use interpreter.path.

karrtikr · 2022-03-15T11:34:30Z

src/client/common/installer/condaInstaller.ts


        const pythonPath = isResource(resource)
            ? this.serviceContainer.get<IConfigurationService>(IConfigurationService).getSettings(resource).pythonPath
-            : resource.path;


.path is no longer unique.

karrtikr · 2022-03-15T11:34:30Z

src/client/common/installer/condaInstaller.ts


        const pythonPath = isResource(resource)
            ? this.serviceContainer.get<IConfigurationService>(IConfigurationService).getSettings(resource).pythonPath
-            : resource.path;


.path is no longer unique.

karrtikr · 2022-03-15T11:35:33Z

src/client/common/installer/moduleInstaller.ts

        resource?: InterpreterUri,
        cancel?: CancellationToken,
        flags?: ModuleInstallFlags,
+        options?: InstallOptions,


Add support for installing modules as a process. Earlier we just sent the command in terminal.

…o condawithoutpython

karrtikr · 2022-03-17T17:55:43Z

src/client/common/installer/pipInstaller.ts

+        // For conda environments not containing a python interpreter, do not use pip installer due to bugs in `conda run`:
+        // https://github.com/microsoft/vscode-python/issues/18479#issuecomment-1044427511
+        // https://github.com/conda/conda/issues/11211


That is, conda run -n <envname> python -m pip install <module> doesn't work.

karrtikr · 2022-03-17T17:57:00Z

src/client/common/installer/productInstaller.ts

+        return true;
+    }
+
+    public async install(


Runs conda install -n <envname> python for environments lacking an interpreter, so they become normal conda environments.

karrtikr · 2022-03-17T17:57:58Z

src/client/common/process/pythonEnvironment.ts

        (file, args, opts) => procs.exec(file, args, opts),
        (command, opts) => procs.shellExec(command, opts),
    );
-    return new PythonEnvironment(pythonPath, deps);


pythonPath can also be path to env folder, whereas the first parameter should refer to interpreter path.

karrtikr · 2022-03-17T17:59:44Z

src/client/interpreter/configuration/interpreterSelector/commands/setInterpreter.ts

            itemsWithFullName,
            this.workspaceService.getWorkspaceFolder(resource)?.uri,
        );
-        if (recommended && arePathsSame(items[0].interpreter.path, recommended.interpreter.path)) {


.path is no longer unique so use .id.

karrtikr · 2022-03-17T18:03:13Z

src/client/pythonEnvironments/base/info/index.ts

    OtherVirtual = 'virt-other',
 }

+export interface EnvPathType {


Uniquely identifies an environment.

karrtikr · 2022-03-17T18:04:39Z

src/client/pythonEnvironments/base/locators/composite/envsResolver.ts

    return resolvedEnv;
 }
+
+async function getExecutablePathAndEnvPath(path: string) {


path can either be a python executable or env path.

kimadeline

I understand the broad context of these changes (and renaming many __interpreter__ functions to __environment__ to reflect the new support), but the intricacies of this PR flew above my head 😅

You already got Karthik's approval so I assume this PR is good to go, are there any specific changes I should focus on?

src/client/pythonEnvironments/base/locators/composite/resolverUtils.ts

karrtikr · 2022-03-21T12:22:23Z

@kimadeline I see 😅 I think it's better to validate all the intricacies anyways. So I would like to merge this now so it can be tested properly for testing week.

… a python interpreter (microsoft/vscode-python#18427) * Support conda environments without a python executable * Fix interpreter display * Fix areSameEnv * Add support to select env folders as interpreterPaths * Allow selecting such environments * Handle resolving environment path * Document resolver works for both env path and executable * Fxi bug * Simplify conda.ts * Define identifiers for an environment * Fix getCondaEnvironment * Introduce an id property to environments * Update proposed discovery API to handle environments * Fix bug with interpreter display * Normalize path passed in resolveEnv * Update environment details API * Dont use pythonPath for getting active interpreter for activation commands * Support conda activation * Support ${command:python.interpreterPath} with this envs * Fix getActiveItem * Add comment justifying using `.pythonPath` for middleware * Fix shebang codelens * Fix startup telemetry * Do not support pip installer for such environments * Trigger discovery once installation is finished for such environments * Automatically install python into environment once it is selected * Add telemetry for new interpreters discovered * Add telemtry if such an env is selected * Fix bugs and cache installer * Fix compile errors, tests, and add tests * Fix some tests * Ignore id when comparing envs * Phew, fixed terrible tests in module installer * Fix more tests * MOre * Skip resolver tests on linux * Fix tests * If environment doesn't contain python do not support pip installer * Skip module install tests for python as it is not a module * News entry * Remove unnecssary commnet * Fix bug introduced by merges * Code reviews

github-actions bot assigned karrtikr Feb 3, 2022

karrtikr force-pushed the condawithoutpython branch from 71c441c to 37f0910 Compare February 3, 2022 19:40

karrtikr changed the title ~~Detect conda environments lacking a python interpreter~~ Add support for detection and selection of conda environments lacking a python interpreter Feb 3, 2022

karrtikr force-pushed the condawithoutpython branch 2 times, most recently from b1e8a5a to 39d7ecd Compare February 4, 2022 12:57

karrtikr mentioned this pull request Feb 4, 2022

Improve Python execution factory getExecutable() #18442

Merged

karrtikr force-pushed the condawithoutpython branch 2 times, most recently from 40fbc61 to 20a90f1 Compare February 10, 2022 16:55

karrtikr force-pushed the condawithoutpython branch from ccbf154 to dd00f2c Compare February 14, 2022 12:57

Kartik Raj added 21 commits February 18, 2022 18:08

Support conda environments without a python executable

9ce2893

Fix interpreter display

d311863

Fix areSameEnv

5fb3f7d

Add support to select env folders as interpreterPaths

aaaaa46

Allow selecting such environments

05e50b1

Handle resolving environment path

56d7bb4

Document resolver works for both env path and executable

6c98d94

Fxi bug

0dc5a68

Simplify conda.ts

4856da1

Define identifiers for an environment

44ae604

Fix getCondaEnvironment

e0d8744

Introduce an id property to environments

ebb5206

Update proposed discovery API to handle environments

ef0008e

Fix bug with interpreter display

1aac36e

Normalize path passed in resolveEnv

2afd514

Update environment details API

e058b7a

Dont use pythonPath for getting active interpreter for activation com…

50ed39d

…mands

Support conda activation

da25d60

Support ${command:python.interpreterPath} with this envs

0ca6dd0

Fix getActiveItem

6c35c5b

Add comment justifying using .pythonPath for middleware

80fda87

Kartik Raj added 5 commits March 11, 2022 22:50

Add telemetry for new interpreters discovered

26bff7c

Add telemtry if such an env is selected

54aaccf

Merge branch 'main' of https://github.com/microsoft/vscode-python int…

38c5be8

…o condawithoutpython

Fix bugs and cache installer

629ef20

Fix compile errors, tests, and add tests

7dfa521

karrtikr commented Mar 15, 2022

View reviewed changes

Kartik Raj added 10 commits March 15, 2022 18:37

Fix some tests

9b09188

Ignore id when comparing envs

b0cf7be

Phew, fixed terrible tests in module installer

21189bd

Fix more tests

0ec2461

MOre

657b8fc

Skip resolver tests on linux

fbe1d39

Fix tests

104be45

If environment doesn't contain python do not support pip installer

1f508dc

Skip module install tests for python as it is not a module

1220841

News entry

592d46d

karrtikr marked this pull request as ready for review March 17, 2022 11:32

Merge branch 'main' of https://github.com/microsoft/vscode-python int…

6f10dcb

…o condawithoutpython

karrtikr commented Mar 17, 2022

View reviewed changes

karrtikr requested review from karthiknadig and kimadeline March 17, 2022 18:07

karthiknadig approved these changes Mar 17, 2022

View reviewed changes

Kartik Raj added 2 commits March 18, 2022 13:44

Remove unnecssary commnet

bc27abd

Fix bug introduced by merges

51d6eb0

kimadeline reviewed Mar 18, 2022

View reviewed changes

src/client/pythonEnvironments/base/locators/composite/resolverUtils.ts Outdated Show resolved Hide resolved

src/client/pythonEnvironments/base/locators/composite/resolverUtils.ts Outdated Show resolved Hide resolved

Code reviews

7763572

karrtikr merged commit f1d0509 into microsoft:main Mar 21, 2022

karrtikr deleted the condawithoutpython branch March 21, 2022 12:22

Conversation

karrtikr commented Feb 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kimadeline left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

karrtikr commented Mar 21, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

karrtikr commented Feb 3, 2022 •

edited

Loading