Merge branch 'main' into switch-poetry-terminal-activation

Author: eleanorjboyd

.github/workflows/pr-check.yml

@@ -8,7 +8,7 @@ on:
       - release*
 
 env:
-  NODE_VERSION: '20.18.0'
+  NODE_VERSION: '20.18.1'
 
 jobs:
   build-vsix:

.github/workflows/push-check.yml

@@ -9,7 +9,7 @@ on:
       - 'release-*'
 
 env:
-  NODE_VERSION: '20.18.0'
+  NODE_VERSION: '20.18.1'
 
 jobs:
   build-vsix:

.nvmrc

@@ -1 +1 @@
-20.18.0
+20.18.1

build/azure-pipeline.pre-release.yml

@@ -66,7 +66,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '20.18.0'
+          versionSpec: '20.18.1'
         displayName: Select Node version
 
       - task: UsePythonVersion@0

build/azure-pipeline.stable.yml

@@ -56,7 +56,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '20.18.0'
+          versionSpec: '20.18.1'
         displayName: Select Node version
 
       - task: UsePythonVersion@0

examples/README.md

@@ -1,6 +1,6 @@
 ## Requirements
 
-1. `node` >= 20.18.0
+1. `node` >= 20.18.1
 2. `npm` >= 10.9.0
 3. `yo` >= 5.0.0 (installed via `npm install -g yo`)
 4. `generator-code` >= 1.11.4 (installed via `npm install -g generator-code`)

src/common/localize.ts

@@ -36,8 +36,8 @@ export namespace PackageManagement {
     export const enterPackageNames = l10n.t('Enter package names');
     export const searchCommonPackages = l10n.t('Search common `PyPI` packages');
     export const searchCommonPackagesDescription = l10n.t('Search and Install common `PyPI` packages');
-    export const workspaceDependencies = l10n.t('Install workspace dependencies');
-    export const workspaceDependenciesDescription = l10n.t('Install dependencies found in the current workspace.');
+    export const workspaceDependencies = l10n.t('Install project dependencies');
+    export const workspaceDependenciesDescription = l10n.t('Install packages found in dependency files.');
     export const selectPackagesToUninstall = l10n.t('Select packages to uninstall');
     export const enterPackagesPlaceHolder = l10n.t('Enter package names separated by space');
     export const editArguments = l10n.t('Edit arguments');

src/managers/builtin/venvUtils.ts

@@ -371,16 +371,22 @@ export async function quickCreateVenv(
     if (additionalPackages) {
         allPackages.push(...additionalPackages);
     }
-    return await createWithProgress(
-        nativeFinder,
-        api,
-        log,
-        manager,
-        baseEnv,
-        venvRoot,
-        path.join(venvRoot.fsPath, '.venv'),
-        { install: allPackages, uninstall: [] },
-    );
+
+    // Check if .venv already exists
+    let venvPath = path.join(venvRoot.fsPath, '.venv');
+    if (await fsapi.pathExists(venvPath)) {
+        // increment to create a unique name, e.g. .venv-1
+        let i = 1;
+        while (await fsapi.pathExists(`${venvPath}-${i}`)) {
+            i++;
+        }
+        venvPath = `${venvPath}-${i}`;
+    }
+
+    return await createWithProgress(nativeFinder, api, log, manager, baseEnv, venvRoot, venvPath, {
+        install: allPackages,
+        uninstall: [],
+    });
 }
 
 export async function createPythonVenv(
@@ -393,7 +399,6 @@ export async function createPythonVenv(
     options: { showQuickAndCustomOptions: boolean; additionalPackages?: string[] },
 ): Promise<PythonEnvironment | undefined> {
     const sortedEnvs = ensureGlobalEnv(basePythons, log);
-    const project = api.getPythonProject(venvRoot);
 
     let customize: boolean | undefined = true;
     if (options.showQuickAndCustomOptions) {
@@ -403,26 +408,11 @@ export async function createPythonVenv(
     if (customize === undefined) {
         return;
     } else if (customize === false) {
-        sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'quick' });
-        const installables = await getProjectInstallable(api, project ? [project] : undefined);
-        const allPackages = [];
-        allPackages.push(...(installables?.flatMap((i) => i.args ?? []) ?? []));
-        if (options.additionalPackages) {
-            allPackages.push(...options.additionalPackages);
-        }
-        return await createWithProgress(
-            nativeFinder,
-            api,
-            log,
-            manager,
-            sortedEnvs[0],
-            venvRoot,
-            path.join(venvRoot.fsPath, '.venv'),
-            { install: allPackages, uninstall: [] },
-        );
+        return quickCreateVenv(nativeFinder, api, log, manager, sortedEnvs[0], venvRoot, options.additionalPackages);
     } else {
         sendTelemetryEvent(EventNames.VENV_CREATION, undefined, { creationType: 'custom' });
     }
+    const project = api.getPythonProject(venvRoot);
 
     const basePython = await pickEnvironmentFrom(sortedEnvs);
     if (!basePython || !basePython.execInfo) {

src/managers/poetry/poetryManager.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { Disposable, EventEmitter, MarkdownString, ProgressLocation, ThemeIcon, Uri } from 'vscode';
+import { Disposable, EventEmitter, MarkdownString, ProgressLocation, Uri } from 'vscode';
 import {
     DidChangeEnvironmentEventArgs,
     DidChangeEnvironmentsEventArgs,
@@ -49,7 +49,6 @@ export class PoetryManager implements EnvironmentManager, Disposable {
         this.displayName = 'Poetry';
         this.preferredPackageManagerId = 'ms-python.python:poetry';
         this.tooltip = new MarkdownString(PoetryStrings.poetryManager, true);
-        this.iconPath = new ThemeIcon('python');
     }
 
     name: string;