Skip to content

Commit 63f5957

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/cipher-base-1.0.6
2 parents 2eedb20 + 3747439 commit 63f5957

File tree

12 files changed

+34
-23
lines changed

12 files changed

+34
-23
lines changed

.github/actions/lint/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Install Node
13-
uses: actions/setup-node@v4
13+
uses: actions/setup-node@v5
1414
with:
1515
node-version: ${{ inputs.node_version }}
1616
cache: 'npm'
@@ -36,7 +36,7 @@ runs:
3636
shell: bash
3737

3838
- name: Install Python
39-
uses: actions/setup-python@v5
39+
uses: actions/setup-python@v6
4040
with:
4141
python-version: '3.x'
4242
cache: 'pip'

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
python -m pip install --upgrade -r build/test-requirements.txt
156156
157157
- name: Run Pyright
158-
uses: jakebailey/pyright-action@b5d50e5cde6547546a5c4ac92e416a8c2c1a1dfe # v2.3.2
158+
uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3
159159
with:
160160
version: 1.1.308
161161
working-directory: 'python_files'
@@ -236,7 +236,7 @@ jobs:
236236
sparse-checkout-cone-mode: false
237237

238238
- name: Install Node
239-
uses: actions/setup-node@v4
239+
uses: actions/setup-node@v5
240240
with:
241241
node-version: ${{ env.NODE_VERSION }}
242242
cache: 'npm'

.github/workflows/pr-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
python -m pip install --upgrade -r build/test-requirements.txt
139139
140140
- name: Run Pyright
141-
uses: jakebailey/pyright-action@b5d50e5cde6547546a5c4ac92e416a8c2c1a1dfe # v2.3.2
141+
uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3
142142
with:
143143
version: 1.1.308
144144
working-directory: 'python_files'
@@ -233,7 +233,7 @@ jobs:
233233
sparse-checkout-cone-mode: false
234234

235235
- name: Install Node
236-
uses: actions/setup-node@v4
236+
uses: actions/setup-node@v5
237237
with:
238238
node-version: ${{ env.NODE_VERSION }}
239239
cache: 'npm'
@@ -505,7 +505,7 @@ jobs:
505505
sparse-checkout-cone-mode: false
506506

507507
- name: Install Node
508-
uses: actions/setup-node@v4
508+
uses: actions/setup-node@v5
509509
with:
510510
node-version: ${{ env.NODE_VERSION }}
511511
cache: 'npm'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
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)'
4545

4646
- name: 'Ensure PR has an associated issue'
47-
uses: actions/github-script@v7
47+
uses: actions/github-script@v8
4848
with:
4949
script: |
5050
const labels = context.payload.pull_request.labels.map(label => label.name);

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Python extension for Visual Studio Code
22

3-
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) with rich support for the [Python language](https://www.python.org/) (for all [actively supported Python versions](https://devguide.python.org/versions/#supported-versions)), providing access points for extensions to seamlessly integrate and offer support for IntelliSense (Pylance), debugging (Python Debugger), formatting, linting, code navigation, refactoring, variable explorer, test explorer, and more!
3+
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) with rich support for the [Python language](https://www.python.org/) (for all [actively supported Python versions](https://devguide.python.org/versions/#supported-versions)), providing access points for extensions to seamlessly integrate and offer support for IntelliSense (Pylance), debugging (Python Debugger), formatting, linting, code navigation, refactoring, variable explorer, test explorer, environment management (**NEW** Python Environments Extension).
44

55
## Support for [vscode.dev](https://vscode.dev/)
66

@@ -13,7 +13,7 @@ The Python extension will automatically install the following extensions by defa
1313

1414
- [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) – performant Python language support
1515
- [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)
16+
- **(NEW)** [Python Environments](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-python-envs) – dedicated environment management (see below)
1717

1818
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).
1919

build/azure-pipeline.stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ extends:
128128
project: 'Monaco'
129129
definition: 593
130130
buildVersionToDownload: 'latestFromBranch'
131-
branchName: 'refs/heads/release/2025.12'
131+
branchName: 'refs/heads/release/2025.14'
132132
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
133133
artifactName: 'bin-$(buildTarget)'
134134
itemPattern: |

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "python",
33
"displayName": "Python",
44
"description": "Python language support with extension access points for IntelliSense (Pylance), Debugging (Python Debugger), linting, formatting, refactoring, unit tests, and more.",
5-
"version": "2025.13.0-dev",
5+
"version": "2025.15.0-dev",
66
"featureFlags": {
77
"usingNewInterpreterStorage": true
88
},
@@ -1502,7 +1502,7 @@
15021502
"name": "get_python_environment_details",
15031503
"displayName": "Get Python Environment Info",
15041504
"userDescription": "%python.languageModelTools.get_python_environment_details.userDescription%",
1505-
"modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. The details returned include the 1. Type of Environment (conda, venv, etec), 2. Version of Python, 3. List of all installed packages with their versions. ALWAYS call configure_python_environment before using this tool.",
1505+
"modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. The details returned include the 1. Type of Python Environment (conda, venv, etec), 2. Version of Python, 3. List of all installed Python packages with their versions. ALWAYS call configure_python_environment before using this tool.",
15061506
"toolReferenceName": "getPythonEnvironmentInfo",
15071507
"tags": [
15081508
"python",
@@ -1552,7 +1552,7 @@
15521552
"name": "install_python_packages",
15531553
"displayName": "Install Python Package",
15541554
"userDescription": "%python.languageModelTools.install_python_packages.userDescription%",
1555-
"modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment. ALWAYS call configure_python_environment before using this tool.",
1555+
"modelDescription": "Installs Python packages in the given workspace. Use this tool to install Python packages in the user's chosen Python environment. ALWAYS call configure_python_environment before using this tool.",
15561556
"toolReferenceName": "installPythonPackage",
15571557
"tags": [
15581558
"python",
@@ -1571,7 +1571,7 @@
15711571
"items": {
15721572
"type": "string"
15731573
},
1574-
"description": "The list of packages to install."
1574+
"description": "The list of Python packages to install."
15751575
},
15761576
"resourcePath": {
15771577
"type": "string",

python_files/python_server.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import sys
66
import traceback
77
import uuid
8+
from pathlib import Path
89
from typing import Dict, List, Optional, Union
910

1011
STDIN = sys.stdin
@@ -172,6 +173,16 @@ def get_headers():
172173

173174

174175
if __name__ == "__main__":
176+
# https://docs.python.org/3/tutorial/modules.html#the-module-search-path
177+
# The directory containing the input script (or the current directory when no file is specified).
178+
# Here we emulate the same behavior like no file is specified.
179+
input_script_dir = Path(__file__).parent
180+
script_dir_str = str(input_script_dir)
181+
if script_dir_str in sys.path:
182+
sys.path.remove(script_dir_str)
183+
while "" in sys.path:
184+
sys.path.remove("")
185+
sys.path.insert(0, "")
175186
while not STDIN.closed:
176187
try:
177188
headers = get_headers()

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# 2) uv pip compile --generate-hashes --upgrade requirements.in -o requirements.txt
55

66
# Unittest test adapter
7-
typing-extensions==4.14.1
7+
typing-extensions==4.15.0
88

99
# Fallback env creator for debian
1010
microvenv

0 commit comments

Comments
 (0)