Merge branch 'main' into dependabot/github_actions/dot-github/actions/build-vsix/actions/upload-artifact-5

Author: eleanorjboyd

.github/workflows/pr-file-check.yml

@@ -42,17 +42,3 @@ jobs:
             .github/test_plan.md
           skip-label: 'skip tests'
           failure-message: 'TypeScript code was edited without also editing a ${file-pattern} file; see the Testing page in our wiki on testing guidelines (the ${skip-label} label can be used to pass this check)'
-
-      - name: 'Ensure PR has an associated issue'
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const labels = context.payload.pull_request.labels.map(label => label.name);
-            if (!labels.includes('skip-issue-check')) {
-              const prBody = context.payload.pull_request.body || '';
-              const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
-              const issueReference = prBody.match(/#\d+/);
-              if (!issueLink && !issueReference) {
-                core.setFailed('No associated issue found in the PR description.');
-              }
-            }

.github/workflows/pr-issue-check.yml

@@ -0,0 +1,31 @@
+name: PR issue check
+
+on:
+  pull_request:
+    types:
+      - 'opened'
+      - 'reopened'
+      - 'synchronize'
+      - 'labeled'
+      - 'unlabeled'
+
+permissions: {}
+
+jobs:
+  check-for-attached-issue:
+    name: 'Check for attached issue'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Ensure PR has an associated issue'
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            if (!labels.includes('skip-issue-check')) {
+              const prBody = context.payload.pull_request.body || '';
+              const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
+              const issueReference = prBody.match(/#\d+/);
+              if (!issueLink && !issueReference) {
+                core.setFailed('No associated issue found in the PR description.');
+              }
+            }

README.md

@@ -90,13 +90,13 @@ To see all available Python commands, open the Command Palette and type `Python`
 
 Learn more about the rich features of the Python extension:
 
--   [IntelliSense](https://code.visualstudio.com/docs/python/editing#_autocomplete-and-intellisense): Edit your code with auto-completion, code navigation, syntax checking and more
--   [Linting](https://code.visualstudio.com/docs/python/linting): Get additional code analysis with Pylint, Flake8 and more
--   [Code formatting](https://code.visualstudio.com/docs/python/formatting): Format your code with black, autopep or yapf
--   [Debugging](https://code.visualstudio.com/docs/python/debugging): Debug your Python scripts, web apps, remote or multi-threaded processes
+-   [IntelliSense](https://code.visualstudio.com/docs/python/editing#_autocomplete-and-intellisense): Edit your code with auto-completion, code navigation, syntax checking and more.
+-   [Linting](https://code.visualstudio.com/docs/python/linting): Get additional code analysis with Pylint, Flake8 and more.
+-   [Code formatting](https://code.visualstudio.com/docs/python/formatting): Format your code with black, autopep or yapf.
+-   [Debugging](https://code.visualstudio.com/docs/python/debugging): Debug your Python scripts, web apps, remote or multi-threaded processes.
 -   [Testing](https://code.visualstudio.com/docs/python/unit-testing): Run and debug tests through the Test Explorer with unittest or pytest.
--   [Jupyter Notebooks](https://code.visualstudio.com/docs/python/jupyter-support): Create and edit Jupyter Notebooks, add and run code cells, render plots, visualize variables through the variable explorer, visualize dataframes with the data viewer, and more
--   [Environments](https://code.visualstudio.com/docs/python/environments): Automatically activate and switch between virtualenv, venv, pipenv, conda and pyenv environments
+-   [Jupyter Notebooks](https://code.visualstudio.com/docs/python/jupyter-support): Create and edit Jupyter Notebooks, add and run code cells, render plots, visualize variables through the variable explorer, visualize dataframes with the data viewer, and more.
+-   [Environments](https://code.visualstudio.com/docs/python/environments): Automatically activate and switch between virtualenv, venv, pipenv, conda and pyenv environments.
 -   [Refactoring](https://code.visualstudio.com/docs/python/editing#_refactoring): Restructure your Python code with variable extraction and method extraction. Additionally, there is componentized support to enable additional refactoring, such as import sorting, through extensions including [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) and [Ruff](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff).
 
 

python_files/pythonrc.py

@@ -52,7 +52,9 @@ def __str__(self):
         result = ""
         # For non-windows allow recent_command history.
         if sys.platform != "win32":
-            result = "{command_executed}{command_line}{command_finished}{prompt_started}{prompt}{command_start}".format(
+            result = "{soh}{command_executed}{command_line}{command_finished}{prompt_started}{stx}{prompt}{soh}{command_start}{stx}".format(
+                soh="\001",
+                stx="\002",
                 command_executed="\x1b]633;C\x07",
                 command_line="\x1b]633;E;" + str(get_last_command()) + "\x07",
                 command_finished="\x1b]633;D;" + str(exit_code) + "\x07",

python_files/tests/test_shell_integration.py

@@ -17,7 +17,7 @@ def test_decoration_success():
     if sys.platform != "win32" and (not is_wsl):
         assert (
             result
-            == "\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;0\x07\x1b]633;A\x07>>> \x1b]633;B\x07"
+            == "\x01\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;0\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
         )
     else:
         pass
@@ -32,7 +32,7 @@ def test_decoration_failure():
     if sys.platform != "win32" and (not is_wsl):
         assert (
             result
-            == "\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;1\x07\x1b]633;A\x07>>> \x1b]633;B\x07"
+            == "\x01\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;1\x07\x1b]633;A\x07\x02>>> \x01\x1b]633;B\x07\x02"
         )
     else:
         pass

python_files/vscode_pytest/run_pytest_script.py

@@ -51,20 +51,22 @@ def run_pytest(args):
 
     run_test_ids_pipe = os.environ.get("RUN_TEST_IDS_PIPE")
     if run_test_ids_pipe:
+        ids_path = pathlib.Path(run_test_ids_pipe)
         try:
-            # Read the test ids from the file, delete file, and run pytest.
-            ids_path = pathlib.Path(run_test_ids_pipe)
+            # Read the test ids from the file and run pytest.
             ids = ids_path.read_text(encoding="utf-8").splitlines()
-            try:
-                ids_path.unlink()
-            except Exception as e:
-                print("Error[vscode-pytest]: unable to delete temp file" + str(e))
             arg_array = ["-p", "vscode_pytest", *args, *ids]
             print("Running pytest with args: " + str(arg_array))
             pytest.main(arg_array)
         except Exception as e:
             print("Error[vscode-pytest]: unable to read testIds from temp file" + str(e))
             run_pytest(args)
+        finally:
+            # Delete the test ids temp file.
+            try:
+                ids_path.unlink()
+            except Exception as e:
+                print("Error[vscode-pytest]: unable to delete temp file" + str(e))
     else:
         print("Error[vscode-pytest]: RUN_TEST_IDS_PIPE env var is not set.")
         run_pytest(args)

src/client/pythonEnvironments/base/locators/common/nativePythonUtils.ts

@@ -23,7 +23,7 @@ export enum NativePythonEnvironmentKind {
     VirtualEnvWrapper = 'VirtualEnvWrapper',
     WindowsStore = 'WindowsStore',
     WindowsRegistry = 'WindowsRegistry',
-    VenvUv = 'VenvUv',
+    VenvUv = 'Uv',
 }
 
 const mapping = new Map<NativePythonEnvironmentKind, PythonEnvKind>([

src/client/testing/testController/common/types.ts

@@ -155,26 +155,22 @@ export interface ITestResultResolver {
     _resolveCoverage(payload: CoveragePayload, runInstance: TestRun): void;
 }
 export interface ITestDiscoveryAdapter {
-    // ** first line old method signature, second line new method signature
-    discoverTests(uri: Uri): Promise<void>;
     discoverTests(
         uri: Uri,
-        executionFactory?: IPythonExecutionFactory,
+        executionFactory: IPythonExecutionFactory,
         token?: CancellationToken,
         interpreter?: PythonEnvironment,
     ): Promise<void>;
 }
 
 // interface for execution/runner adapter
 export interface ITestExecutionAdapter {
-    // ** first line old method signature, second line new method signature
-    runTests(uri: Uri, testIds: string[], profileKind?: boolean | TestRunProfileKind): Promise<void>;
     runTests(
         uri: Uri,
         testIds: string[],
-        profileKind?: boolean | TestRunProfileKind,
-        runInstance?: TestRun,
-        executionFactory?: IPythonExecutionFactory,
+        profileKind: boolean | TestRunProfileKind | undefined,
+        runInstance: TestRun,
+        executionFactory: IPythonExecutionFactory,
         debugLauncher?: ITestDebugLauncher,
         interpreter?: PythonEnvironment,
     ): Promise<void>;

src/client/testing/testController/controller.ts

@@ -276,8 +276,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                         }
                         await testAdapter.discoverTests(
                             this.testController,
-                            this.refreshCancellation.token,
                             this.pythonExecFactory,
+                            this.refreshCancellation.token,
                             await this.interpreterService.getActiveInterpreter(workspace.uri),
                         );
                     } else {
@@ -302,8 +302,8 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                         }
                         await testAdapter.discoverTests(
                             this.testController,
-                            this.refreshCancellation.token,
                             this.pythonExecFactory,
+                            this.refreshCancellation.token,
                             await this.interpreterService.getActiveInterpreter(workspace.uri),
                         );
                     } else {
@@ -453,9 +453,9 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                                 this.testController,
                                 runInstance,
                                 testItems,
+                                this.pythonExecFactory,
                                 token,
                                 request.profile?.kind,
-                                this.pythonExecFactory,
                                 this.debugLauncher,
                                 await this.interpreterService.getActiveInterpreter(workspace.uri),
                             );
@@ -470,9 +470,9 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                                 this.testController,
                                 runInstance,
                                 testItems,
+                                this.pythonExecFactory,
                                 token,
                                 request.profile?.kind,
-                                this.pythonExecFactory,
                                 this.debugLauncher,
                                 await this.interpreterService.getActiveInterpreter(workspace.uri),
                             );

src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts

@@ -38,7 +38,7 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
 
     async discoverTests(
         uri: Uri,
-        executionFactory?: IPythonExecutionFactory,
+        executionFactory: IPythonExecutionFactory,
         token?: CancellationToken,
         interpreter?: PythonEnvironment,
     ): Promise<void> {
@@ -69,7 +69,7 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
         uri: Uri,
         discoveryPipeName: string,
         cSource: CancellationTokenSource,
-        executionFactory?: IPythonExecutionFactory,
+        executionFactory: IPythonExecutionFactory,
         interpreter?: PythonEnvironment,
         token?: CancellationToken,
     ): Promise<void> {
@@ -170,7 +170,7 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
             resource: uri,
             interpreter,
         };
-        const execService = await executionFactory?.createActivatedEnvironment(creationOptions);
+        const execService = await executionFactory.createActivatedEnvironment(creationOptions);
 
         const execInfo = await execService?.getExecutablePath();
         traceVerbose(`Executable path for pytest discovery: ${execInfo}.`);