Skip to content

Commit a62c36a

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/sha.js-2.4.12
2 parents ded7c07 + ed276d0 commit a62c36a

File tree

13 files changed

+59
-47
lines changed

13 files changed

+59
-47
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/jedilsp_requirements/requirements.txt

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,58 @@ attrs==25.3.0 \
66
# via
77
# cattrs
88
# lsprotocol
9-
cattrs==24.1.3 \
10-
--hash=sha256:981a6ef05875b5bb0c7fb68885546186d306f10f0f6718fe9b96c226e68821ff \
11-
--hash=sha256:adf957dddd26840f27ffbd060a6c4dd3b2192c5b7c2c0525ef1bd8131d8a83f5
9+
cattrs==25.2.0 \
10+
--hash=sha256:539d7eedee7d2f0706e4e109182ad096d608ba84633c32c75ef3458f1d11e8f1 \
11+
--hash=sha256:f46c918e955db0177be6aa559068390f71988e877c603ae2e56c71827165cc06
1212
# via
1313
# jedi-language-server
1414
# lsprotocol
1515
# pygls
16-
docstring-to-markdown==0.16 \
17-
--hash=sha256:097bf502fdf040b0d019688a7cc1abb89b98196801448721740e8aa3e5075627 \
18-
--hash=sha256:f92cc42357b2c932f70ca2ebc79f7805039a34011ad381c1b6ac3481e81596ce
16+
docstring-to-markdown==0.17 \
17+
--hash=sha256:df72a112294c7492487c9da2451cae0faeee06e86008245c188c5761c9590ca3 \
18+
--hash=sha256:fd7d5094aa83943bf5f9e1a13701866b7c452eac19765380dead666e36d3711c
1919
# via jedi-language-server
20-
exceptiongroup==1.2.2 \
21-
--hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
22-
--hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
20+
exceptiongroup==1.3.0 \
21+
--hash=sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10 \
22+
--hash=sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88
2323
# via cattrs
24-
importlib-metadata==8.6.1 \
25-
--hash=sha256:02a89390c1e15fdfdc0d7c6b25cb3e62650d0494005c97d6f148bf5b9787525e \
26-
--hash=sha256:310b41d755445d74569f993ccfc22838295d9fe005425094fad953d7f15c8580
24+
importlib-metadata==8.7.0 \
25+
--hash=sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000 \
26+
--hash=sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd
2727
# via docstring-to-markdown
2828
jedi==0.19.2 \
2929
--hash=sha256:4770dc3de41bde3966b02eb84fbcf557fb33cce26ad23da12c742fb50ecb11f0 \
3030
--hash=sha256:a8ef22bde8490f57fe5c7681a3c83cb58874daf72b4784de3cce5b6ef6edb5b9
3131
# via jedi-language-server
32-
jedi-language-server==0.45.0 \
33-
--hash=sha256:b44eb380f87c37935b91e4399f048dc935eb7d85829130fdbcecfdad61e1362b \
34-
--hash=sha256:f9ffd662877324ff28720c770197514184801b049a2d2c43190a7708b061f397
32+
jedi-language-server==0.45.1 \
33+
--hash=sha256:8c0c6b4eaeffdbb87be79e9897c9929ffeddf875dff7c1c36dd67768e294942b \
34+
--hash=sha256:a1fcfba8008f2640e921937fcf1933c3961d74249341eba8b3ef9a0c3f817102
3535
# via -r python_files/jedilsp_requirements/requirements.in
3636
lsprotocol==2023.0.1 \
3737
--hash=sha256:c75223c9e4af2f24272b14c6375787438279369236cd568f596d4951052a60f2 \
3838
--hash=sha256:cc5c15130d2403c18b734304339e51242d3018a05c4f7d0f198ad6e0cd21861d
3939
# via
4040
# jedi-language-server
4141
# pygls
42-
parso==0.8.4 \
43-
--hash=sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18 \
44-
--hash=sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d
42+
parso==0.8.5 \
43+
--hash=sha256:034d7354a9a018bdce352f48b2a8a450f05e9d6ee85db84764e9b6bd96dafe5a \
44+
--hash=sha256:646204b5ee239c396d040b90f9e272e9a8017c630092bf59980beb62fd033887
4545
# via jedi
4646
pygls==1.3.1 \
4747
--hash=sha256:140edceefa0da0e9b3c533547c892a42a7d2fd9217ae848c330c53d266a55018 \
4848
--hash=sha256:6e00f11efc56321bdeb6eac04f6d86131f654c7d49124344a9ebb968da3dd91e
4949
# via
5050
# -r python_files/jedilsp_requirements/requirements.in
5151
# jedi-language-server
52-
typing-extensions==4.13.2 \
53-
--hash=sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c \
54-
--hash=sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef
52+
typing-extensions==4.15.0 \
53+
--hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \
54+
--hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548
5555
# via
5656
# cattrs
5757
# docstring-to-markdown
58+
# exceptiongroup
5859
# jedi-language-server
59-
zipp==3.21.0 \
60-
--hash=sha256:2c9958f6430a2040341a52eb608ed6dd93ef4392e02ffe219417c1b28b5dd1f4 \
61-
--hash=sha256:ac1bbe05fd2991f160ebce24ffbac5f6d11d83dc90891255885223d42b3cd931
60+
zipp==3.23.0 \
61+
--hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \
62+
--hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166
6263
# via importlib-metadata

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()

0 commit comments

Comments
 (0)