Misc fixes

microsoft · Jul 17, 2024 · 87f4382 · 87f4382
1 parent b0b74a0
commit 87f4382
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
@@ -23,13 +23,13 @@ const untildify = require('untildify');
 
 const PYTHON_ENV_TOOLS_PATH = isWindows()
     ? path.join(EXTENSION_ROOT_DIR, 'python-env-tools', 'bin', 'pet.exe')
-    : path.join(EXTENSION_ROOT_DIR, 'python-env-tools', 'bin', 'pet');
+    : '/Users/donjayamanne/Development/vsc/python-environment-tools/target/debug/pet';
 
 export interface NativeEnvInfo {
     displayName?: string;
     name?: string;
     executable?: string;
-    kind: string;
+    kind?: string;
     version?: string;
     prefix?: string;
     manager?: NativeEnvManagerInfo;
@@ -309,7 +309,6 @@ class NativeGlobalPythonFinderImpl extends DisposableBase implements NativePytho
         disposable.add(
             this.connection.onNotification('environment', (data: NativeEnvInfo) => {
                 this.outputChannel.info(`Discovered env: ${data.executable || data.prefix}`);
-                this.outputChannel.trace(`Discovered env info:\n ${JSON.stringify(data, undefined, 4)}`);
                 // We know that in the Python extension if either Version of Prefix is not provided by locator
                 // Then we end up resolving the information.
                 // Lets do that here,
@@ -326,7 +325,6 @@ class NativeGlobalPythonFinderImpl extends DisposableBase implements NativePytho
                         })
                         .then((environment) => {
                             this.outputChannel.info(`Resolved ${environment.executable}`);
-                            this.outputChannel.trace(`Environment resolved:\n ${JSON.stringify(data, undefined, 4)}`);
                             discovered.fire(environment);
                         })
                         .catch((ex) => this.outputChannel.error(`Error in Resolving ${JSON.stringify(data)}`, ex));

diff --git a/src/client/pythonEnvironments/nativeAPI.ts b/src/client/pythonEnvironments/nativeAPI.ts
@@ -153,7 +153,7 @@ function toPythonEnvInfo(finder: NativePythonFinder, nativeEnv: NativeEnvInfo):
     if (!validEnv(finder, nativeEnv)) {
         return undefined;
     }
-    const kind = finder.categoryToKind(nativeEnv.category);
+    const kind = finder.categoryToKind(nativeEnv.kind);
     const arch = toArch(nativeEnv.arch);
     const version: PythonVersion = parseVersion(nativeEnv.version ?? '');
     const name = getName(nativeEnv, kind);
@@ -230,18 +230,27 @@ class NativePythonEnvironments implements IDiscoveryAPI, Disposable {
                     try {
                         if (validEnv(this.finder, native)) {
                             if (!native.version) {
-                                this.resolveEnv(native.executable ?? native.prefix)
-                                    .then(() => {
-                                        const env = toPythonEnvInfo(this.finder, native);
-                                        if (env) {
-                                            this._envs.push(env);
-                                            this._onChanged.fire({
-                                                type: FileChangeType.Created,
-                                                new: env,
-                                            });
-                                        }
-                                    })
-                                    .ignoreErrors();
+                                if (
+                                    this.finder.categoryToKind(native.kind) === PythonEnvKind.Conda &&
+                                    !native.executable
+                                ) {
+                                    // This is a conda env without python, no point trying to resolve this.
+                                    // TODO: we still need to add this to this._envs
+                                    traceError(`Unhandled Conda environment without python: ${native.prefix}`);
+                                } else {
+                                    this.resolveEnv(native.executable ?? native.prefix)
+                                        .then(() => {
+                                            const env = toPythonEnvInfo(this.finder, native);
+                                            if (env) {
+                                                this._envs.push(env);
+                                                this._onChanged.fire({
+                                                    type: FileChangeType.Created,
+                                                    new: env,
+                                                });
+                                            }
+                                        })
+                                        .ignoreErrors();
+                                }
                             } else {
                                 const version = parseVersion(native.version);
                                 if (version.micro < 0 || version.minor < 0 || version.major < 0) {