Merge branch 'main' into awake-cricket

eleanorjboyd · web-flow · commit 8b67c2bd162c · 2025-07-10T08:30:08.000-07:00
diff --git a/.github/release_plan.md b/.github/release_plan.md
@@ -40,7 +40,7 @@ NOTE: the number of this release is in the issue title and can be substituted in
 -   [ ] Update `pet`:
     -  [ ] Go to the [pet](https://github.com/microsoft/python-environment-tools) repo and check `main` and latest `release/*` branch. If there are new changes in `main` then create a branch called `release/YYYY.minor` (matching python extension release `major.minor`).
     -  [ ] Update `build\azure-pipeline.stable.yml` to point to the latest `release/YYYY.minor` for `python-environment-tools`.
--   [ ] Change the version in `package.json` to the next **even** number and switch the `-dev` to `-rc`. (🤖)
+-   [ ] Change the version in `package.json` to the next **even** number. (🤖)
 -   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(you should now see changes to the `package.json` and `package-lock.json` at this point which update the version number **only**)_. (🤖)
 -   [ ] Update `ThirdPartyNotices-Repository.txt` as appropriate. You can check by looking at the [commit history](https://github.com/microsoft/vscode-python/commits/main) and scrolling through to see if there's anything listed there which might have pulled in some code directly into the repository from somewhere else. If you are still unsure you can check with the team.
 -   [ ] Create a PR from your branch  **`bump-release-[YYYY.minor]`** to `main`. Add the `"no change-log"` tag to the PR so it does not show up on the release notes before merging it.
@@ -64,7 +64,7 @@ NOTE: If there are release branches that are two versions old you can delete the
 ### Step 4: Return `main` to dev and unfreeze (❄️ ➡ 💧)
 NOTE: The purpose of this step is ensuring that main always is on a dev version number for every night's 🌃 pre-release. Therefore it is imperative that you do this directly after the previous steps to reset the version in main to a dev version **before** a pre-release goes out.
 -   [ ] Create a branch called **`bump-dev-version-YYYY.[minor+1]`**.
--   [ ] Bump the minor version number in the `package.json` to the next `YYYY.[minor+1]` which will be an odd number, and switch the `-rc` to `-dev`.(🤖)
+-   [ ] Bump the minor version number in the `package.json` to the next `YYYY.[minor+1]` which will be an odd number, and add `-dev`.(🤖)
 -   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(you should now see changes to the `package.json` and `package-lock.json` only relating to the new version number)_ . (🤖)
 -   [ ] Create a PR from this branch against `main` and merge it.
 
@@ -83,12 +83,6 @@ NOTE: this PR should make all CI relating to `main` be passing again (such as th
 ### Step 6: Take the release branch from a candidate to the finalized release
 -   [ ] Make sure the [appropriate pull requests](https://github.com/microsoft/vscode-docs/pulls) for the [documentation](https://code.visualstudio.com/docs/python/python-tutorial) -- including the [WOW](https://code.visualstudio.com/docs/languages/python) page -- are ready.
 -   [ ] Check to make sure any final updates to the **`release/YYYY.minor`** branch have been merged.
--   [ ] Create a branch against  **`release/YYYY.minor`** called **`finalized-release-[YYYY.minor]`**.
--   [ ] Update the version in `package.json` to remove the `-rc` (🤖) from the version.
--   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(the only update should be the version number if `package-lock.json` has been kept up-to-date)_. (🤖)
--   [ ] Update `ThirdPartyNotices-Repository.txt` manually if necessary.
--   [ ] Create a PR from **`finalized-release-[YYYY.minor]`** against `release/YYYY.minor` and merge it.
-
 
 ### Step 7: Execute the Release
 -   [ ] Make sure CI is passing for **`release/YYYY.minor`** release branch (🤖).
diff --git a/.github/workflows/pr-file-check.yml b/.github/workflows/pr-file-check.yml
@@ -51,7 +51,8 @@ jobs:
             if (!labels.includes('skip-issue-check')) {
               const prBody = context.payload.pull_request.body || '';
               const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
-              if (!issueLink) {
+              const issueReference = prBody.match(/#\d+/);
+              if (!issueLink && !issueReference) {
                 core.setFailed('No associated issue found in the PR description.');
               }
             }
diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml
@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
     steps:
       - name: 'PR impact specified'
-        uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5.5.0
+        uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
         with:
           mode: exactly
           count: 1
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ If you encounter issues with any of the listed extensions, please file an issue
 
 ## Quick start
 
--   **Step 1.** [Install a supported version of Python on your system](https://code.visualstudio.com/docs/python/python-tutorial#_prerequisites) (note: that the system install of Python on macOS is not supported).
+-   **Step 1.** [Install a supported version of Python on your system](https://code.visualstudio.com/docs/python/python-tutorial#_prerequisites) (note: the system install of Python on macOS is not supported).
 -   **Step 2.** [Install the Python extension for Visual Studio Code](https://code.visualstudio.com/docs/editor/extension-gallery).
 -   **Step 3.** Open or create a Python file and start coding!
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,14 +2,14 @@
     "name": "python",
     "displayName": "Python",
     "description": "Python language support with extension access points for IntelliSense (Pylance), Debugging (Python Debugger), linting, formatting, refactoring, unit tests, and more.",
-    "version": "2025.10.0",
+    "version": "2025.11.0-dev",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },
     "capabilities": {
         "untrustedWorkspaces": {
-            "supported": "limited",
-            "description": "Only Partial IntelliSense with Pylance is supported. Cannot execute Python with untrusted files."
+            "supported": false,
+            "description": "The Python extension is not available in untrusted workspaces. Use Pylance to get partial IntelliSense support for Python files."
         },
         "virtualWorkspaces": {
             "supported": "limited",
@@ -272,6 +272,11 @@
                 "category": "Python",
                 "command": "python.createNewFile"
             },
+            {
+                "category": "Python",
+                "command": "python.copyTestId",
+                "title": "%python.command.python.testing.copyTestId.title%"
+            },
             {
                 "category": "Python",
                 "command": "python.analysis.restartLanguageServer",
@@ -1231,6 +1236,13 @@
                     "command": "python.reportIssue"
                 }
             ],
+            "testing/item/context": [
+                {
+                    "command": "python.copyTestId",
+                    "group": "navigation",
+                    "when": "controllerId == 'python-tests'"
+                }
+            ],
             "commandPalette": [
                 {
                     "category": "Python",
@@ -1306,6 +1318,12 @@
                     "title": "%python.command.python.execSelectionInTerminal.title%",
                     "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python"
                 },
+                {
+                    "category": "Python",
+                    "command": "python.copyTestId",
+                    "title": "%python.command.python.testing.copyTestId.title%",
+                    "when": "false"
+                },
                 {
                     "category": "Python",
                     "command": "python.execInREPL",
diff --git a/package.nls.json b/package.nls.json
@@ -27,6 +27,7 @@
     "python.command.python.analysis.restartLanguageServer.title": "Restart Language Server",
     "python.command.python.launchTensorBoard.title": "Launch TensorBoard",
     "python.command.python.refreshTensorBoard.title": "Refresh TensorBoard",
+    "python.command.python.testing.copyTestId.title": "Copy Test Id",
     "python.createEnvironment.contentButton.description": "Show or hide Create Environment button in the editor for `requirements.txt` or other dependency files.",
     "python.createEnvironment.trigger.description": "Detect if environment creation is required for the current project",
     "python.menu.createNewFile.title": "Python File",
diff --git a/python_files/unittestadapter/django_handler.py b/python_files/unittestadapter/django_handler.py
@@ -104,7 +104,7 @@ def django_execution_runner(manage_py_path: str, test_ids: List[str], args: List
             manage_file = manage_path.open()
             with argv_context, suppress_context, manage_file:
                 manage_code = manage_file.read()
-                exec(manage_code, {"__name__": "__main__"})
+                exec(manage_code, {"__name__": "__main__", "__file__": manage_path})
         except OSError as e:
             raise VSCodeUnittestError("Error running Django, unable to read manage.py") from e
     except Exception as e:
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,8 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --generate-hashes requirements.in -o requirements.txt
-importlib-metadata==8.6.1 \
-    --hash=sha256:02a89390c1e15fdfdc0d7c6b25cb3e62650d0494005c97d6f148bf5b9787525e \
-    --hash=sha256:310b41d755445d74569f993ccfc22838295d9fe005425094fad953d7f15c8580
+importlib-metadata==8.7.0 \
+    --hash=sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000 \
+    --hash=sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd
     # via -r requirements.in
 microvenv==2023.5.post1 \
     --hash=sha256:32c46afea874e300f69f1add0806eb0795fd02b5fb251092fba0b73c059a7d1f \
diff --git a/src/client/common/application/commands.ts b/src/client/common/application/commands.ts
@@ -3,7 +3,7 @@
 
 'use strict';
 
-import { CancellationToken, Position, TextDocument, Uri } from 'vscode';
+import { CancellationToken, Position, TestItem, TextDocument, Uri } from 'vscode';
 import { Commands as LSCommands } from '../../activation/commands';
 import { Channel, Commands, CommandSource } from '../constants';
 import { CreateEnvironmentOptions } from '../../pythonEnvironments/creation/proposed.createEnvApis';
@@ -50,6 +50,7 @@ export type AllCommands = keyof ICommandNameArgumentTypeMapping;
  * Used to provide strong typing for command & args.
  */
 export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgumentTypeMapping {
+    [Commands.CopyTestId]: [TestItem];
     [Commands.Create_Environment]: [CreateEnvironmentOptions];
     ['vscode.openWith']: [Uri, string];
     ['workbench.action.quickOpen']: [string];
diff --git a/src/client/common/constants.ts b/src/client/common/constants.ts
@@ -39,6 +39,7 @@ export namespace Commands {
     export const CreateNewFile = 'python.createNewFile';
     export const ClearWorkspaceInterpreter = 'python.clearWorkspaceInterpreter';
     export const Create_Environment = 'python.createEnvironment';
+    export const CopyTestId = 'python.copyTestId';
     export const Create_Environment_Button = 'python.createEnvironment-button';
     export const Create_Environment_Check = 'python.createEnvironmentCheck';
     export const Create_Terminal = 'python.createTerminal';
diff --git a/src/client/interpreter/virtualEnvs/activatedEnvLaunch.ts b/src/client/interpreter/virtualEnvs/activatedEnvLaunch.ts
@@ -85,12 +85,9 @@ export class ActivatedEnvironmentLaunch implements IActivatedEnvironmentLaunch {
 
     @cache(-1, true)
     private async _selectIfLaunchedViaActivatedEnv(doNotBlockOnSelection = false): Promise<string | undefined> {
-        if (this.workspaceService.workspaceFile) {
-            // Assuming multiroot workspaces cannot be directly launched via `code .` command.
-            return undefined;
-        }
         if (process.env.VSCODE_CLI !== '1') {
             // We only want to select the interpreter if VS Code was launched from the command line.
+            traceLog("Skipping ActivatedEnv Detection:  process.env.VSCODE_CLI !== '1'");
             return undefined;
         }
         traceVerbose('VS Code was not launched from the command line');
diff --git a/src/client/repl/nativeRepl.ts b/src/client/repl/nativeRepl.ts
@@ -3,15 +3,7 @@
 
 // Native Repl class that holds instance of pythonServer and replController
 
-import {
-    NotebookController,
-    NotebookControllerAffinity,
-    NotebookDocument,
-    QuickPickItem,
-    TextEditor,
-    Uri,
-    WorkspaceFolder,
-} from 'vscode';
+import { NotebookController, NotebookDocument, QuickPickItem, TextEditor, Uri, WorkspaceFolder } from 'vscode';
 import { Disposable } from 'vscode-jsonrpc';
 import { PVSC_EXTENSION_ID } from '../common/constants';
 import { showQuickPick } from '../common/vscodeApis/windowApis';
@@ -172,24 +164,19 @@ export class NativeRepl implements Disposable {
             }
         }
 
-        const notebookEditor = await openInteractiveREPL(
-            this.replController,
-            this.notebookDocument ?? wsMementoUri,
-            preserveFocus,
-        );
-        if (notebookEditor) {
-            this.notebookDocument = notebookEditor.notebook;
+        const result = await openInteractiveREPL(this.notebookDocument ?? wsMementoUri, preserveFocus);
+        if (result) {
+            this.notebookDocument = result.notebookEditor.notebook;
             await updateWorkspaceStateValue<string | undefined>(
                 NATIVE_REPL_URI_MEMENTO,
                 this.notebookDocument.uri.toString(),
             );
 
-            if (this.notebookDocument) {
-                this.replController.updateNotebookAffinity(this.notebookDocument, NotebookControllerAffinity.Default);
-                await selectNotebookKernel(notebookEditor, this.replController.id, PVSC_EXTENSION_ID);
-                if (code) {
-                    await executeNotebookCell(notebookEditor, code);
-                }
+            if (result.documentCreated) {
+                await selectNotebookKernel(result.notebookEditor, this.replController.id, PVSC_EXTENSION_ID);
+            }
+            if (code) {
+                await executeNotebookCell(result.notebookEditor, code);
             }
         }
     }
diff --git a/src/client/repl/replCommandHandler.ts b/src/client/repl/replCommandHandler.ts
@@ -1,5 +1,4 @@
 import {
-    NotebookController,
     NotebookEditor,
     ViewColumn,
     NotebookDocument,
@@ -10,7 +9,6 @@ import {
     Uri,
 } from 'vscode';
 import { getExistingReplViewColumn, getTabNameForUri } from './replUtils';
-import { PVSC_EXTENSION_ID } from '../common/constants';
 import { showNotebookDocument } from '../common/vscodeApis/windowApis';
 import { openNotebookDocument, applyEdit } from '../common/vscodeApis/workspaceApis';
 import { executeCommand } from '../common/vscodeApis/commandApis';
@@ -19,46 +17,42 @@ import { executeCommand } from '../common/vscodeApis/commandApis';
  * Function that opens/show REPL using IW UI.
  */
 export async function openInteractiveREPL(
-    notebookController: NotebookController,
     notebookDocument: NotebookDocument | Uri | undefined,
     preserveFocus: boolean = true,
-): Promise<NotebookEditor | undefined> {
+): Promise<{ notebookEditor: NotebookEditor; documentCreated: boolean } | undefined> {
     let viewColumn = ViewColumn.Beside;
+    let alreadyExists = false;
     if (notebookDocument instanceof Uri) {
         // Case where NotebookDocument is undefined, but workspace mementoURI exists.
         notebookDocument = await openNotebookDocument(notebookDocument);
     } else if (notebookDocument) {
         // Case where NotebookDocument (REPL document already exists in the tab)
         const existingReplViewColumn = getExistingReplViewColumn(notebookDocument);
         viewColumn = existingReplViewColumn ?? viewColumn;
+        alreadyExists = true;
     } else if (!notebookDocument) {
         // Case where NotebookDocument doesnt exist, or
         // became outdated (untitled.ipynb created without Python extension knowing, effectively taking over original Python REPL's URI)
         notebookDocument = await openNotebookDocument('jupyter-notebook');
     }
-    const editor = await showNotebookDocument(notebookDocument!, {
+
+    const notebookEditor = await showNotebookDocument(notebookDocument!, {
         viewColumn,
         asRepl: 'Python REPL',
         preserveFocus,
     });
 
     // Sanity check that we opened a Native REPL from showNotebookDocument.
     if (
-        !editor ||
-        !editor.notebook ||
-        !editor.notebook.uri ||
-        getTabNameForUri(editor.notebook.uri) !== 'Python REPL'
+        !notebookEditor ||
+        !notebookEditor.notebook ||
+        !notebookEditor.notebook.uri ||
+        getTabNameForUri(notebookEditor.notebook.uri) !== 'Python REPL'
     ) {
         return undefined;
     }
 
-    await executeCommand('notebook.selectKernel', {
-        editor,
-        id: notebookController.id,
-        extension: PVSC_EXTENSION_ID,
-    });
-
-    return editor;
+    return { notebookEditor, documentCreated: !alreadyExists };
 }
 
 /**
diff --git a/src/client/repl/replCommands.ts b/src/client/repl/replCommands.ts
@@ -31,10 +31,8 @@ export async function registerStartNativeReplCommand(
             sendTelemetryEvent(EventName.REPL, undefined, { replType: 'Native' });
             const interpreter = await getActiveInterpreter(uri, interpreterService);
             if (interpreter) {
-                if (interpreter) {
-                    const nativeRepl = await getNativeRepl(interpreter, disposables);
-                    await nativeRepl.sendToNativeRepl(undefined, false);
-                }
+                const nativeRepl = await getNativeRepl(interpreter, disposables);
+                await nativeRepl.sendToNativeRepl(undefined, false);
             }
         }),
     );
diff --git a/src/client/testing/main.ts b/src/client/testing/main.ts
@@ -1,7 +1,16 @@
 'use strict';
 
 import { inject, injectable } from 'inversify';
-import { ConfigurationChangeEvent, Disposable, Uri, tests, TestResultState, WorkspaceFolder, Command } from 'vscode';
+import {
+    ConfigurationChangeEvent,
+    Disposable,
+    Uri,
+    tests,
+    TestResultState,
+    WorkspaceFolder,
+    Command,
+    TestItem,
+} from 'vscode';
 import { IApplicationShell, ICommandManager, IContextKeyManager, IWorkspaceService } from '../common/application/types';
 import * as constants from '../common/constants';
 import '../common/extensions';
@@ -21,6 +30,7 @@ import { ExtensionContextKey } from '../common/application/contextKeys';
 import { checkForFailedTests, updateTestResultMap } from './testController/common/testItemUtilities';
 import { Testing } from '../common/utils/localize';
 import { traceVerbose, traceWarn } from '../logging';
+import { writeTestIdToClipboard } from './utils';
 
 @injectable()
 export class TestingService implements ITestingService {
@@ -145,7 +155,6 @@ export class UnitTestManagementService implements IExtensionActivationService {
 
     private registerCommands(): void {
         const commandManager = this.serviceContainer.get<ICommandManager>(ICommandManager);
-
         this.disposableRegistry.push(
             commandManager.registerCommand(
                 constants.Commands.Tests_Configure,
@@ -182,6 +191,9 @@ export class UnitTestManagementService implements IExtensionActivationService {
                     },
                 };
             }),
+            commandManager.registerCommand(constants.Commands.CopyTestId, async (testItem: TestItem) => {
+                writeTestIdToClipboard(testItem);
+            }),
         );
     }
 
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
@@ -549,7 +549,10 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         this.disposables.push(
             onDidSaveTextDocument(async (doc: TextDocument) => {
                 const settings = this.configSettings.getSettings(doc.uri);
-                if (minimatch.default(doc.uri.fsPath, settings.testing.autoTestDiscoverOnSavePattern)) {
+                if (
+                    settings.testing.autoTestDiscoverOnSaveEnabled &&
+                    minimatch.default(doc.uri.fsPath, settings.testing.autoTestDiscoverOnSavePattern)
+                ) {
                     traceVerbose(`Testing: Trigger refresh after saving ${doc.uri.fsPath}`);
                     this.sendTriggerTelemetry('watching');
                     this.refreshData.trigger(doc.uri, false);
diff --git a/src/client/testing/utils.ts b/src/client/testing/utils.ts
diff --git a/src/test/interpreters/virtualEnvs/activatedEnvLaunch.unit.test.ts b/src/test/interpreters/virtualEnvs/activatedEnvLaunch.unit.test.ts
diff --git a/src/test/testing/utils.unit.test.ts b/src/test/testing/utils.unit.test.ts

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ jobs:`
`51`	`51`	`if (!labels.includes('skip-issue-check')) {`
`52`	`52`	`const prBody = context.payload.pull_request.body \|\| '';`
`53`	`53`	`const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);`
`54`		`- if (!issueLink) {`
	`54`	`+ const issueReference = prBody.match(/#\d+/);`
	`55`	`+ if (!issueLink && !issueReference) {`
`55`	`56`	`core.setFailed('No associated issue found in the PR description.');`
`56`	`57`	`}`
`57`	`58`	`}`