Merge branch 'main' into dependabot/npm_and_yarn/multi-644fead5d1

Author: eleanorjboyd

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

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Ensure PR has an associated issue'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const labels = context.payload.pull_request.labels.map(label => label.name);

build/test-requirements.txt

@@ -12,8 +12,8 @@ flask
 fastapi
 uvicorn
 django
-testresources
 testscenarios
+testtools
 
 # Integrated TensorBoard tests
 tensorboard

package-lock.json

@@ -1713,7 +1713,7 @@
         "iconv-lite": "^0.6.3",
         "inversify": "^6.0.2",
         "jsonc-parser": "^3.0.0",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "minimatch": "^5.1.8",
         "named-js-regexp": "^1.3.3",
         "node-stream-zip": "^1.6.0",

package.json

@@ -1,15 +1,2 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-
-import os
-
-import testresources
-from testscenarios import generate_scenarios
-
-def load_tests(loader, tests, pattern):
-    this_dir = os.path.dirname(__file__)
-    mytests = loader.discover(start_dir=this_dir, pattern=pattern)
-    result = testresources.OptimisingTestSuite()
-    result.addTests(generate_scenarios(mytests))
-    result.addTests(generate_scenarios(tests))
-    return result

python_files/tests/unittestadapter/.data/test_scenarios/tests/__init__.py

@@ -1,13 +1,27 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from testscenarios import TestWithScenarios
+import unittest
+
+from testscenarios import TestWithScenarios, generate_scenarios
+
+
+def load_tests(loader, standard_tests, pattern):  # noqa: ARG001
+    # Pre-expand ``TestWithScenarios`` scenarios at load time so individual
+    # scenario-multiplied test IDs (e.g. ``test_operations(add)``) can be
+    # resolved by ``unittest.TestLoader.loadTestsFromName``. Without this,
+    # ``TestWithScenarios`` only multiplies scenarios at ``run()`` time and
+    # loading a specific scenario by name raises ``AttributeError``.
+    result = unittest.TestSuite()
+    result.addTests(generate_scenarios(standard_tests))
+    return result
+
 
 class TestMathOperations(TestWithScenarios):
     scenarios = [
         ('add', {'test_id': 'test_add', 'a': 5, 'b': 3, 'expected': 8}),
         ('subtract', {'test_id': 'test_subtract', 'a': 5, 'b': 3, 'expected': 2}),
-        ('multiply', {'test_id': 'test_multiply', 'a': 5, 'b': 3, 'expected': 15})
+        ('multiply', {'test_id': 'test_multiply', 'a': 5, 'b': 3, 'expected': 15}),
     ]
     a: int = 0
     b: int = 0

python_files/tests/unittestadapter/.data/test_scenarios/tests/test_scene.py

@@ -8,9 +8,9 @@ microvenv==2025.0 \
     --hash=sha256:568155ec18af01c89f270d35d123ab803b09672b480c3702d15fd69e9cc5bd1e \
     --hash=sha256:8a2568a8390a4ffb5af2f05e7642454e03b887e582d192b6316326974eab5d0f
     # via -r requirements.in
-packaging==26.0 \
-    --hash=sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4 \
-    --hash=sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529
+packaging==26.1 \
+    --hash=sha256:5d9c0669c6285e491e0ced2eee587eaf67b670d94a19e94e3984a481aba6802f \
+    --hash=sha256:f042152b681c4bfac5cae2742a55e103d27ab2ec0f3d88037136b6bfe7c9c5de
     # via -r requirements.in
 tomli==2.4.1 \
     --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \

requirements.txt

@@ -24,7 +24,7 @@ import {
     IInterpreterService,
     IInterpreterStatusbarVisibilityFilter,
 } from '../contracts';
-import { useEnvExtension } from '../../envExt/api.internal';
+import { shouldEnvExtHandleActivation } from '../../envExt/api.internal';
 
 /**
  * Based on https://github.com/microsoft/vscode-python/issues/18040#issuecomment-992567670.
@@ -68,7 +68,7 @@ export class InterpreterDisplay implements IInterpreterDisplay, IExtensionSingle
     }
 
     public async activate(): Promise<void> {
-        if (useEnvExtension()) {
+        if (shouldEnvExtHandleActivation()) {
             return;
         }
         const application = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
@@ -115,7 +115,7 @@ export class InterpreterDisplay implements IInterpreterDisplay, IExtensionSingle
         }
     }
     private async updateDisplay(workspaceFolder?: Uri) {
-        if (useEnvExtension()) {
+        if (shouldEnvExtHandleActivation()) {
             this.statusBar?.hide();
             this.languageStatus?.dispose();
             this.languageStatus = undefined;

src/client/interpreter/display/index.ts

@@ -59,7 +59,7 @@ suite('Interpreters Display', () => {
     let pathUtils: TypeMoq.IMock<IPathUtils>;
     let languageStatusItem: TypeMoq.IMock<LanguageStatusItem>;
     let traceLogStub: sinon.SinonStub;
-    let useEnvExtensionStub: sinon.SinonStub;
+    let shouldEnvExtHandleActivationStub: sinon.SinonStub;
     async function createInterpreterDisplay(filters: IInterpreterStatusbarVisibilityFilter[] = []) {
         interpreterDisplay = new InterpreterDisplay(serviceContainer.object);
         try {
@@ -69,8 +69,8 @@ suite('Interpreters Display', () => {
     }
 
     async function setupMocks(useLanguageStatus: boolean) {
-        useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
-        useEnvExtensionStub.returns(false);
+        shouldEnvExtHandleActivationStub = sinon.stub(extapi, 'shouldEnvExtHandleActivation');
+        shouldEnvExtHandleActivationStub.returns(false);
 
         serviceContainer = TypeMoq.Mock.ofType<IServiceContainer>();
         workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();