Add executable path as id for envs (microsoft#23840)

eleanorjboyd · Jul 30, 2024 · 4eb9b6c · 4eb9b6c
1 parent 40d426c
commit 4eb9b6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/client/pythonEnvironments/nativeAPI.ts b/src/client/pythonEnvironments/nativeAPI.ts
@@ -162,12 +162,14 @@ function toPythonEnvInfo(nativeEnv: NativeEnvInfo): PythonEnvInfo | undefined {
  ? getDisplayName(version, kind, arch, name)
  : nativeEnv.displayName ?? 'Python';
 
+ const executable = nativeEnv.executable ?? makeExecutablePath(nativeEnv.prefix);
  return {
  name,
  location: getLocation(nativeEnv),
  kind,
+ id: executable,
  executable: {
- filename: nativeEnv.executable ?? makeExecutablePath(nativeEnv.prefix),
+ filename: executable,
  sysPrefix: nativeEnv.prefix ?? '',
  ctime: -1,
  mtime: -1,

diff --git a/src/test/pythonEnvironments/nativeAPI.unit.test.ts b/src/test/pythonEnvironments/nativeAPI.unit.test.ts
@@ -41,6 +41,7 @@ suite('Native Python API', () => {
 
  const expectedBasicEnv: PythonEnvInfo = {
  arch: Architecture.Unknown,
+ id: '/usr/bin/python',
  detailedDisplayName: "Python 3.12.0 ('basic_python')",
  display: "Python 3.12.0 ('basic_python')",
  distro: { org: '' },
@@ -89,6 +90,7 @@ suite('Native Python API', () => {
  detailedDisplayName: "Python 3.12.0 ('conda_python')",
  display: "Python 3.12.0 ('conda_python')",
  distro: { org: '' },
+ id: '/home/user/.conda/envs/conda_python/python',
  executable: {
  filename: '/home/user/.conda/envs/conda_python/python',
  sysPrefix: '/home/user/.conda/envs/conda_python',
@@ -108,6 +110,7 @@ suite('Native Python API', () => {
  detailedDisplayName: 'Conda Python',
  display: 'Conda Python',
  distro: { org: '' },
+ id: exePath,
  executable: {
  filename: exePath,
  sysPrefix: '/home/user/.conda/envs/conda_python',