Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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']

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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{
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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{
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions src/test/pythonEnvironments/nativePythonFinder.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ suite('Native Python Finder', () => {
let getConfigurationStub: sinon.SinonStub;
let configMock: typemoq.IMock<WorkspaceConfiguration>;
let getWorkspaceFolderPathsStub: sinon.SinonStub;
let isTrustedStub: sinon.SinonStub;

setup(() => {
createLogOutputChannelStub = sinon.stub(windowsApis, 'createLogOutputChannel');
Expand All @@ -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<WorkspaceConfiguration>();
configMock.setup((c) => c.get<string>('venvPath')).returns(() => undefined);
Expand Down
Loading