From 4753b9da274261b18e3fc8cf006d2a67ae6e8c6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2026 05:22:45 +0000 Subject: [PATCH 1/3] Bump typing-extensions from 4.15.0 to 4.16.0 Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.15.0 to 4.16.0. - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](https://github.com/python/typing_extensions/compare/4.15.0...4.16.0) --- updated-dependencies: - dependency-name: typing-extensions dependency-version: 4.16.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.in | 2 +- requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.in b/requirements.in index 8bbc9a0f3728..59f58faa214d 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ # 2) uv pip compile --generate-hashes --upgrade requirements.in -o requirements.txt # Unittest test adapter -typing-extensions==4.15.0 +typing-extensions==4.16.0 # Fallback env creator for debian microvenv diff --git a/requirements.txt b/requirements.txt index 540590ed2ae7..43a87616a541 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,9 +61,9 @@ tomli==2.4.1 \ --hash=sha256:ff18e6a727ee0ab0388507b89d1bc6a22b138d1e2fa56d1ad494586d61d2eae9 \ --hash=sha256:ff2983983d34813c1aeb0fa89091e76c3a22889ee83ab27c5eeb45100560c049 # via -r requirements.in -typing-extensions==4.15.0 \ - --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \ - --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548 +typing-extensions==4.16.0 \ + --hash=sha256:481caa481374e813c1b176ada14e97f1f67a4539ce9cfeb3f350d78d6370c2e8 \ + --hash=sha256:dc983d19a509c94dba722ee6abd33940f7c05a89e243c47e907eb4db6f1a43e5 # via -r requirements.in zipp==3.21.0 \ --hash=sha256:2c9958f6430a2040341a52eb608ed6dd93ef4392e02ffe219417c1b28b5dd1f4 \ From eed060078cd1d721aad5ba07a46cc10dcb955072 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 6 Jul 2026 17:50:36 +0000 Subject: [PATCH 2/3] Fix nativePythonFinder unit test: stub isTrusted to prevent no-op finder The test was failing because getNativePythonFinder() calls isTrusted() from workspaceApis, and the ts-mockito workspace mock returns undefined (falsy) in the unit test environment. This caused the function to return a no-op finder that yields nothing, making assert.isNotEmpty(envs) fail. Add a sinon stub for workspaceApis.isTrusted returning true in the test setup, consistent with how the test stubs other workspace APIs. --- src/test/pythonEnvironments/nativePythonFinder.unit.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts b/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts index b6182da8111f..da7240a1949c 100644 --- a/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts +++ b/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts @@ -21,6 +21,7 @@ suite('Native Python Finder', () => { let getConfigurationStub: sinon.SinonStub; let configMock: typemoq.IMock; let getWorkspaceFolderPathsStub: sinon.SinonStub; + let isTrustedStub: sinon.SinonStub; setup(() => { createLogOutputChannelStub = sinon.stub(windowsApis, 'createLogOutputChannel'); @@ -29,6 +30,9 @@ suite('Native Python Finder', () => { getWorkspaceFolderPathsStub = sinon.stub(workspaceApis, 'getWorkspaceFolderPaths'); getWorkspaceFolderPathsStub.returns([]); + isTrustedStub = sinon.stub(workspaceApis, 'isTrusted'); + isTrustedStub.returns(true); + getConfigurationStub = sinon.stub(workspaceApis, 'getConfiguration'); configMock = typemoq.Mock.ofType(); configMock.setup((c) => c.get('venvPath')).returns(() => undefined); From e946c2d1f69723b5e446fe28531f96bd4cab4680 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Jul 2026 14:56:09 +0000 Subject: [PATCH 3/3] Switch Windows CI runners from windows-latest to windows-2022 --- .github/workflows/build.yml | 16 ++++++++-------- .github/workflows/pr-check.yml | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78b19331116d..652087768358 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,10 +55,10 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest + - os: windows-2022 target: x86_64-pc-windows-msvc vsix-target: win32-x64 - - os: windows-latest + - os: windows-2022 target: aarch64-pc-windows-msvc vsix-target: win32-arm64 - os: ubuntu-latest @@ -172,7 +172,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-2022] # Run the tests on the oldest and most recent versions of Python. python: ['3.10', '3.x', '3.13'] @@ -213,7 +213,7 @@ jobs: # We're not running CI on macOS for now because it's one less matrix # entry to lower the number of runners used, macOS runners are expensive, # and we assume that Ubuntu is enough to cover the UNIX case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-2022] python: ['3.x'] test-suite: [ts-unit, venv, single-workspace, multi-workspace, debugger, functional] steps: @@ -309,7 +309,7 @@ jobs: run: | python -m pip install virtualenv python -m virtualenv .virtualenv/ - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { & ".virtualenv/Scripts/python.exe" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} virtualEnvPath } else { & ".virtualenv/bin/python" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} virtualEnvPath @@ -323,7 +323,7 @@ jobs: if: matrix.test-suite == 'venv' && startsWith(matrix.python, 3.) run: | python -m venv .venv - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { & ".venv/Scripts/python.exe" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} venvPath } else { & ".venv/bin/python" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} venvPath @@ -337,7 +337,7 @@ jobs: if: matrix.test-suite == 'venv' run: | # 1. For `*.testvirtualenvs.test.ts` - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { $condaPythonPath = Join-Path -Path $Env:CONDA -ChildPath python.exe $condaExecPath = Join-Path -Path $Env:CONDA -ChildPath Scripts | Join-Path -ChildPath conda } else{ @@ -419,7 +419,7 @@ jobs: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the UNIX case. include: - - os: windows-latest + - os: windows-2022 vsix-target: win32-x64 - os: ubuntu-latest vsix-target: linux-x64 diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index c58844bbf110..fda944b39f1e 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -28,10 +28,10 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest + - os: windows-2022 target: x86_64-pc-windows-msvc vsix-target: win32-x64 - - os: windows-latest + - os: windows-2022 target: aarch64-pc-windows-msvc vsix-target: win32-arm64 - os: ubuntu-latest @@ -155,7 +155,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-2022] # Run the tests on the oldest and most recent versions of Python. python: ['3.10', '3.x', '3.13'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release pytest-version: ['pytest', 'pytest@pre-release', 'pytest==6.2.0'] @@ -208,7 +208,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-2022] # Run the tests on the oldest and most recent versions of Python. python: ['3.x'] test-suite: [ts-unit, venv, single-workspace, debugger, functional] @@ -306,7 +306,7 @@ jobs: run: | python -m pip install virtualenv python -m virtualenv .virtualenv/ - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { & ".virtualenv/Scripts/python.exe" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} virtualEnvPath } else { & ".virtualenv/bin/python" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} virtualEnvPath @@ -320,7 +320,7 @@ jobs: if: matrix.test-suite == 'venv' && startsWith(matrix.python, 3.) run: | python -m venv .venv - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { & ".venv/Scripts/python.exe" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} venvPath } else { & ".venv/bin/python" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} venvPath @@ -334,7 +334,7 @@ jobs: if: matrix.test-suite == 'venv' run: | # 1. For `*.testvirtualenvs.test.ts` - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { $condaPythonPath = Join-Path -Path $Env:CONDA -ChildPath python.exe $condaExecPath = Join-Path -Path $Env:CONDA -ChildPath Scripts | Join-Path -ChildPath conda } else{ @@ -408,7 +408,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-2022] steps: - name: Checkout @@ -444,7 +444,7 @@ jobs: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the UNIX case. include: - - os: windows-latest + - os: windows-2022 vsix-target: win32-x64 - os: ubuntu-latest vsix-target: linux-x64 @@ -586,7 +586,7 @@ jobs: run: | python -m pip install virtualenv python -m virtualenv .virtualenv/ - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { & ".virtualenv/Scripts/python.exe" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} virtualEnvPath } else { & ".virtualenv/bin/python" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} virtualEnvPath @@ -599,7 +599,7 @@ jobs: shell: pwsh run: | python -m venv .venv - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { & ".venv/Scripts/python.exe" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} venvPath } else { & ".venv/bin/python" ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} venvPath @@ -612,7 +612,7 @@ jobs: shell: pwsh run: | # 1. For `*.testvirtualenvs.test.ts` - if ('${{ matrix.os }}' -match 'windows-latest') { + if ('${{ matrix.os }}' -match 'windows-2022') { $condaPythonPath = Join-Path -Path $Env:CONDA -ChildPath python.exe $condaExecPath = Join-Path -Path $Env:CONDA -ChildPath Scripts | Join-Path -ChildPath conda } else{