Skip to content

Commit 0d77877

Browse files
authored
Merge branch 'main' into remove-pylance-client2
2 parents 472bffc + 167e6e7 commit 0d77877

File tree

18 files changed

+101
-58
lines changed

18 files changed

+101
-58
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
permissions: {}
1212

1313
env:
14-
NODE_VERSION: 20.18.1
14+
NODE_VERSION: 22.17.0
1515
PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
1616
# Force a path with spaces and to test extension works in these scenarios
1717
# Unicode characters are causing 2.7 failures so skip that for now.
@@ -84,12 +84,12 @@ jobs:
8484
# vsix-target: alpine-arm64
8585
steps:
8686
- name: Checkout
87-
uses: actions/checkout@v4
87+
uses: actions/checkout@v5
8888
with:
8989
persist-credentials: false
9090

9191
- name: Checkout Python Environment Tools
92-
uses: actions/checkout@v4
92+
uses: actions/checkout@v5
9393
with:
9494
repository: 'microsoft/python-environment-tools'
9595
path: 'python-env-tools'
@@ -115,7 +115,7 @@ jobs:
115115
runs-on: ubuntu-latest
116116
steps:
117117
- name: Checkout
118-
uses: actions/checkout@v4
118+
uses: actions/checkout@v5
119119
with:
120120
persist-credentials: false
121121

@@ -135,7 +135,7 @@ jobs:
135135
python-version: ${{ env.PYTHON_VERSION }}
136136

137137
- name: Checkout
138-
uses: actions/checkout@v4
138+
uses: actions/checkout@v5
139139
with:
140140
persist-credentials: false
141141

@@ -178,7 +178,7 @@ jobs:
178178

179179
steps:
180180
- name: Checkout
181-
uses: actions/checkout@v4
181+
uses: actions/checkout@v5
182182
with:
183183
path: ${{ env.special-working-directory-relative }}
184184
persist-credentials: false
@@ -218,13 +218,13 @@ jobs:
218218
test-suite: [ts-unit, venv, single-workspace, multi-workspace, debugger, functional]
219219
steps:
220220
- name: Checkout
221-
uses: actions/checkout@v4
221+
uses: actions/checkout@v5
222222
with:
223223
path: ${{ env.special-working-directory-relative }}
224224
persist-credentials: false
225225

226226
- name: Checkout Python Environment Tools
227-
uses: actions/checkout@v4
227+
uses: actions/checkout@v5
228228
with:
229229
repository: 'microsoft/python-environment-tools'
230230
path: ${{ env.special-working-directory-relative }}/python-env-tools
@@ -426,12 +426,12 @@ jobs:
426426

427427
steps:
428428
- name: Checkout
429-
uses: actions/checkout@v4
429+
uses: actions/checkout@v5
430430
with:
431431
persist-credentials: false
432432

433433
- name: Checkout Python Environment Tools
434-
uses: actions/checkout@v4
434+
uses: actions/checkout@v5
435435
with:
436436
repository: 'microsoft/python-environment-tools'
437437
path: ${{ env.special-working-directory-relative }}/python-env-tools

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040
with:
4141
persist-credentials: false
4242

.github/workflows/gen-issue-velocity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
persist-credentials: false
2020

.github/workflows/info-needed-closer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Actions
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
repository: 'microsoft/vscode-github-triage-actions'
2020
path: ./actions

.github/workflows/issue-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout Actions
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
repository: 'microsoft/vscode-github-triage-actions'
2323
ref: stable

.github/workflows/pr-check.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
permissions: {}
1111

1212
env:
13-
NODE_VERSION: 20.18.1
13+
NODE_VERSION: 22.17.0
1414
PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
1515
MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
1616
ARTIFACT_NAME_VSIX: ms-python-insiders-vsix
@@ -57,12 +57,12 @@ jobs:
5757
# vsix-target: alpine-arm64
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161
with:
6262
persist-credentials: false
6363

6464
- name: Checkout Python Environment Tools
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666
with:
6767
repository: 'microsoft/python-environment-tools'
6868
path: 'python-env-tools'
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888
steps:
8989
- name: Checkout
90-
uses: actions/checkout@v4
90+
uses: actions/checkout@v5
9191
with:
9292
persist-credentials: false
9393

@@ -106,12 +106,12 @@ jobs:
106106
python-version: ${{ env.PYTHON_VERSION }}
107107

108108
- name: Checkout
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@v5
110110
with:
111111
persist-credentials: false
112112

113113
- name: Checkout Python Environment Tools
114-
uses: actions/checkout@v4
114+
uses: actions/checkout@v5
115115
with:
116116
repository: 'microsoft/python-environment-tools'
117117
path: 'python-env-tools'
@@ -162,7 +162,7 @@ jobs:
162162

163163
steps:
164164
- name: Checkout
165-
uses: actions/checkout@v4
165+
uses: actions/checkout@v5
166166
with:
167167
path: ${{ env.special-working-directory-relative }}
168168
persist-credentials: false
@@ -215,13 +215,13 @@ jobs:
215215

216216
steps:
217217
- name: Checkout
218-
uses: actions/checkout@v4
218+
uses: actions/checkout@v5
219219
with:
220220
path: ${{ env.special-working-directory-relative }}
221221
persist-credentials: false
222222

223223
- name: Checkout Python Environment Tools
224-
uses: actions/checkout@v4
224+
uses: actions/checkout@v5
225225
with:
226226
repository: 'microsoft/python-environment-tools'
227227
path: ${{ env.special-working-directory-relative }}/python-env-tools
@@ -412,13 +412,13 @@ jobs:
412412

413413
steps:
414414
- name: Checkout
415-
uses: actions/checkout@v4
415+
uses: actions/checkout@v5
416416
with:
417417
path: ${{ env.special-working-directory-relative }}
418418
persist-credentials: false
419419

420420
- name: Checkout Python Environment Tools
421-
uses: actions/checkout@v4
421+
uses: actions/checkout@v5
422422
with:
423423
repository: 'microsoft/python-environment-tools'
424424
path: ${{ env.special-working-directory-relative }}/python-env-tools
@@ -452,12 +452,12 @@ jobs:
452452
steps:
453453
# Need the source to have the tests available.
454454
- name: Checkout
455-
uses: actions/checkout@v4
455+
uses: actions/checkout@v5
456456
with:
457457
persist-credentials: false
458458

459459
- name: Checkout Python Environment Tools
460-
uses: actions/checkout@v4
460+
uses: actions/checkout@v5
461461
with:
462462
repository: 'microsoft/python-environment-tools'
463463
path: python-env-tools
@@ -488,12 +488,12 @@ jobs:
488488

489489
steps:
490490
- name: Checkout
491-
uses: actions/checkout@v4
491+
uses: actions/checkout@v5
492492
with:
493493
persist-credentials: false
494494

495495
- name: Checkout Python Environment Tools
496-
uses: actions/checkout@v4
496+
uses: actions/checkout@v5
497497
with:
498498
repository: 'microsoft/python-environment-tools'
499499
path: python-env-tools

.github/workflows/test-plan-item-validator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
1313
steps:
1414
- name: Checkout Actions
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
with:
1717
repository: 'microsoft/vscode-github-triage-actions'
1818
path: ./actions

.github/workflows/triage-info-needed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
issues: write
1616
steps:
1717
- name: Checkout Actions
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
with:
2020
repository: 'microsoft/vscode-github-triage-actions'
2121
ref: stable
@@ -39,7 +39,7 @@ jobs:
3939
issues: write
4040
steps:
4141
- name: Checkout Actions
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343
with:
4444
repository: 'microsoft/vscode-github-triage-actions'
4545
ref: stable

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,21 @@ The Python extension does offer [some support](https://github.com/microsoft/vsco
1111

1212
The Python extension will automatically install the following extensions by default to provide the best Python development experience in VS Code:
1313

14-
- [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) - to provide performant Python language support
15-
- [Python Debugger](https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy) - to provide a seamless debug experience with debugpy
14+
- [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) – performant Python language support
15+
- [Python Debugger](https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy) – seamless debug experience with debugpy
16+
- [Python Environments](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-python-envs) – dedicated environment management (see below)
1617

1718
These extensions are optional dependencies, meaning the Python extension will remain fully functional if they fail to be installed. Any or all of these extensions can be [disabled](https://code.visualstudio.com/docs/editor/extension-marketplace#_disable-an-extension) or [uninstalled](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) at the expense of some features. Extensions installed through the marketplace are subject to the [Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf).
1819

20+
### About the Python Environments Extension
21+
22+
You may now see that the **Python Environments Extension** is installed for you, but it may or may not be "enabled" in your VS Code experience. Enablement is controlled by the setting `"python.useEnvironmentsExtension": true` (or `false`).
23+
24+
- If you set this setting to `true`, you will manually opt in to using the Python Environments Extension for environment management.
25+
- If you do not have this setting specified, you may be randomly assigned to have it turned on as we roll it out until it becomes the default experience for all users.
26+
27+
The Python Environments Extension is still under active development and experimentation. Its goal is to provide a dedicated view and improved workflows for creating, deleting, and switching between Python environments, as well as managing packages. If you have feedback, please let us know via [issues](https://github.com/microsoft/vscode-python/issues).
28+
1929
## Extensibility
2030

2131
The Python extension provides pluggable access points for extensions that extend various feature areas to further improve your Python development experience. These extensions are all optional and depend on your project configuration and preferences.

build/azure-pipeline.pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extends:
6666
buildSteps:
6767
- task: NodeTool@0
6868
inputs:
69-
versionSpec: '20.18.1'
69+
versionSpec: '22.17.0'
7070
displayName: Select Node version
7171

7272
- task: UsePythonVersion@0

0 commit comments

Comments
 (0)