Skip to content

Commit d19e2f3

Browse files
danila-grobovdanila-grobov
authored
Merge branch 'main' into django_coverage
2 parents 7d293c7 + cf91dc8 commit d19e2f3

38 files changed

+353
-346
lines changed

‎.github/actions/smoke-tests/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ runs:
1313
using: 'composite'
1414
steps:
1515
- name: Install Node
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: ${{ inputs.node_version }}
1919
cache: 'npm'
2020

2121
- name: Install Python
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: '3.x'
2525
cache: 'pip'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ jobs:
4747
script: |
4848
const labels = context.payload.pull_request.labels.map(label => label.name);
4949
if (!labels.includes('skip-issue-check')) {
50-
const issueLink = context.payload.pull_request.body.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
50+
const prBody = context.payload.pull_request.body || '';
51+
const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
5152
if (!issueLink) {
5253
core.setFailed('No associated issue found in the PR description.');
5354
}

‎build/azure-pipeline.pre-release.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,32 @@ extends:
102102
chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
103103
displayName: Make Directory for python-env-tool binary
104104
105+
- bash: |
106+
if [ "$(vsceTarget)" == "win32-x64" ]; then
107+
echo "##vso[task.setvariable variable=buildTarget]x86_64-pc-windows-msvc"
108+
elif [ "$(vsceTarget)" == "win32-arm64" ]; then
109+
echo "##vso[task.setvariable variable=buildTarget]aarch64-pc-windows-msvc"
110+
elif [ "$(vsceTarget)" == "linux-x64" ]; then
111+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
112+
elif [ "$(vsceTarget)" == "linux-arm64" ]; then
113+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
114+
elif [ "$(vsceTarget)" == "linux-armhf" ]; then
115+
echo "##vso[task.setvariable variable=buildTarget]armv7-unknown-linux-gnueabihf"
116+
elif [ "$(vsceTarget)" == "darwin-x64" ]; then
117+
echo "##vso[task.setvariable variable=buildTarget]x86_64-apple-darwin"
118+
elif [ "$(vsceTarget)" == "darwin-arm64" ]; then
119+
echo "##vso[task.setvariable variable=buildTarget]aarch64-apple-darwin"
120+
elif [ "$(vsceTarget)" == "alpine-x64" ]; then
121+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
122+
elif [ "$(vsceTarget)" == "alpine-arm64" ]; then
123+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
124+
elif [ "$(vsceTarget)" == "web" ]; then
125+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
126+
else
127+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
128+
fi
129+
displayName: Set buildTarget variable
130+
105131
- task: DownloadPipelineArtifact@2
106132
inputs:
107133
buildType: 'specific'
@@ -110,7 +136,7 @@ extends:
110136
buildVersionToDownload: 'latest'
111137
branchName: 'refs/heads/main'
112138
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
113-
artifactName: 'bin-$(vsceTarget)'
139+
artifactName: 'bin-$(buildTarget)'
114140
itemPattern: |
115141
pet.exe
116142
pet

‎build/azure-pipeline.stable.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,32 @@ extends:
9696
chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
9797
displayName: Make Directory for python-env-tool binary
9898
99+
- bash: |
100+
if [ "$(vsceTarget)" == "win32-x64" ]; then
101+
echo "##vso[task.setvariable variable=buildTarget]x86_64-pc-windows-msvc"
102+
elif [ "$(vsceTarget)" == "win32-arm64" ]; then
103+
echo "##vso[task.setvariable variable=buildTarget]aarch64-pc-windows-msvc"
104+
elif [ "$(vsceTarget)" == "linux-x64" ]; then
105+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
106+
elif [ "$(vsceTarget)" == "linux-arm64" ]; then
107+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
108+
elif [ "$(vsceTarget)" == "linux-armhf" ]; then
109+
echo "##vso[task.setvariable variable=buildTarget]armv7-unknown-linux-gnueabihf"
110+
elif [ "$(vsceTarget)" == "darwin-x64" ]; then
111+
echo "##vso[task.setvariable variable=buildTarget]x86_64-apple-darwin"
112+
elif [ "$(vsceTarget)" == "darwin-arm64" ]; then
113+
echo "##vso[task.setvariable variable=buildTarget]aarch64-apple-darwin"
114+
elif [ "$(vsceTarget)" == "alpine-x64" ]; then
115+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
116+
elif [ "$(vsceTarget)" == "alpine-arm64" ]; then
117+
echo "##vso[task.setvariable variable=buildTarget]aarch64-unknown-linux-gnu"
118+
elif [ "$(vsceTarget)" == "web" ]; then
119+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
120+
else
121+
echo "##vso[task.setvariable variable=buildTarget]x86_64-unknown-linux-musl"
122+
fi
123+
displayName: Set buildTarget variable
124+
99125
- task: DownloadPipelineArtifact@2
100126
inputs:
101127
buildType: 'specific'
@@ -104,7 +130,7 @@ extends:
104130
buildVersionToDownload: 'latestFromBranch'
105131
branchName: 'refs/heads/release/2025.2'
106132
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
107-
artifactName: 'bin-$(vsceTarget)'
133+
artifactName: 'bin-$(buildTarget)'
108134
itemPattern: |
109135
pet.exe
110136
pet

‎package-lock.json‎

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

‎package.json‎

Lines changed: 6 additions & 14 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.3.0-dev",
5+
"version": "2025.5.0-dev",
66
"featureFlags": {
77
"usingNewInterpreterStorage": true
88
},
@@ -448,17 +448,15 @@
448448
"pythonPromptNewToolsExt",
449449
"pythonTerminalEnvVarActivation",
450450
"pythonDiscoveryUsingWorkers",
451-
"pythonTestAdapter",
452-
"pythonREPLSmartSend"
451+
"pythonTestAdapter"
453452
],
454453
"enumDescriptions": [
455454
"%python.experiments.All.description%",
456455
"%python.experiments.pythonSurveyNotification.description%",
457456
"%python.experiments.pythonPromptNewToolsExt.description%",
458457
"%python.experiments.pythonTerminalEnvVarActivation.description%",
459458
"%python.experiments.pythonDiscoveryUsingWorkers.description%",
460-
"%python.experiments.pythonTestAdapter.description%",
461-
"%python.experiments.pythonREPLSmartSend.description%"
459+
"%python.experiments.pythonTestAdapter.description%"
462460
]
463461
},
464462
"scope": "window",
@@ -475,17 +473,15 @@
475473
"pythonPromptNewToolsExt",
476474
"pythonTerminalEnvVarActivation",
477475
"pythonDiscoveryUsingWorkers",
478-
"pythonTestAdapter",
479-
"pythonREPLSmartSend"
476+
"pythonTestAdapter"
480477
],
481478
"enumDescriptions": [
482479
"%python.experiments.All.description%",
483480
"%python.experiments.pythonSurveyNotification.description%",
484481
"%python.experiments.pythonPromptNewToolsExt.description%",
485482
"%python.experiments.pythonTerminalEnvVarActivation.description%",
486483
"%python.experiments.pythonDiscoveryUsingWorkers.description%",
487-
"%python.experiments.pythonTestAdapter.description%",
488-
"%python.experiments.pythonREPLSmartSend.description%"
484+
"%python.experiments.pythonTestAdapter.description%"
489485
]
490486
},
491487
"scope": "window",
@@ -639,11 +635,7 @@
639635
"default": false,
640636
"description": "%python.REPL.sendToNativeREPL.description%",
641637
"scope": "resource",
642-
"type": "boolean",
643-
"tags": [
644-
"onExP",
645-
"preview"
646-
]
638+
"type": "boolean"
647639
},
648640
"python.REPL.provideVariables": {
649641
"default": true,

‎package.nls.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"python.experiments.pythonTerminalEnvVarActivation.description": "Enables use of environment variables to activate terminals instead of sending activation commands.",
4343
"python.experiments.pythonDiscoveryUsingWorkers.description": "Enables use of worker threads to do heavy computation when discovering interpreters.",
4444
"python.experiments.pythonTestAdapter.description": "Denotes the Python Test Adapter experiment.",
45-
"python.experiments.pythonREPLSmartSend.description": "Denotes the Python REPL Smart Send experiment.",
4645
"python.experiments.pythonRecommendTensorboardExt.description": "Denotes the Tensorboard Extension recommendation experiment.",
4746
"python.globalModuleInstallation.description": "Whether to install Python modules globally when not using an environment.",
4847
"python.languageServer.description": "Defines type of the language server.",

‎python_files/vscode_pytest/__init__.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def pytest_internalerror(excrepr, excinfo): # noqa: ARG001
121121
excinfo -- the exception information of type ExceptionInfo.
122122
"""
123123
# call.excinfo.exconly() returns the exception as a string.
124-
ERRORS.append(excinfo.exconly() + "\n Check Python Test Logs for more details.")
124+
ERRORS.append(excinfo.exconly() + "\n Check Python Logs for more details.")
125125

126126

127127
def pytest_exception_interact(node, call, report):
@@ -139,9 +139,9 @@ def pytest_exception_interact(node, call, report):
139139
if call.excinfo and call.excinfo.typename != "AssertionError":
140140
if report.outcome == "skipped" and "SkipTest" in str(call):
141141
return
142-
ERRORS.append(call.excinfo.exconly() + "\n Check Python Test Logs for more details.")
142+
ERRORS.append(call.excinfo.exconly() + "\n Check Python Logs for more details.")
143143
else:
144-
ERRORS.append(report.longreprtext + "\n Check Python Test Logs for more details.")
144+
ERRORS.append(report.longreprtext + "\n Check Python Logs for more details.")
145145
else:
146146
# If during execution, send this data that the given node failed.
147147
report_value = "error"
@@ -204,7 +204,7 @@ def pytest_keyboard_interrupt(excinfo):
204204
excinfo -- the exception information of type ExceptionInfo.
205205
"""
206206
# The function execonly() returns the exception as a string.
207-
ERRORS.append(excinfo.exconly() + "\n Check Python Test Logs for more details.")
207+
ERRORS.append(excinfo.exconly() + "\n Check Python Logs for more details.")
208208

209209

210210
class TestOutcome(Dict):
@@ -474,6 +474,9 @@ def pytest_sessionfinish(session, exitstatus):
474474
"lines_covered": list(lines_covered), # list of int
475475
"lines_missed": list(lines_missed), # list of int
476476
}
477+
# convert relative path to absolute path
478+
if not pathlib.Path(file).is_absolute():
479+
file = str(pathlib.Path(file).resolve())
477480
file_coverage_map[file] = file_info
478481

479482
payload: CoveragePayloadDict = CoveragePayloadDict(

‎schemas/condarc.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,14 @@
5959
}
6060
},
6161
"ssl_verify": {
62-
"type": "boolean"
62+
"oneOf": [
63+
{
64+
"type": "boolean"
65+
},
66+
{
67+
"type": "string"
68+
}
69+
]
6370
},
6471
"offline": {
6572
"type": "boolean"

‎src/client/activation/extensionSurvey.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ export class ExtensionSurveyPrompt implements IExtensionSingleActivationService
5959
return false;
6060
}
6161

62-
let feedbackDisabled = false;
62+
let feedbackEnabled = true;
6363

6464
const telemetryConfig = this.workspace.getConfiguration('telemetry');
6565
if (telemetryConfig) {
66-
feedbackDisabled = telemetryConfig.get<boolean>('disableFeedback', false);
66+
feedbackEnabled = telemetryConfig.get<boolean>('feedback.enabled', true);
6767
}
6868

69-
if (feedbackDisabled) {
69+
if (!feedbackEnabled) {
7070
return false;
7171
}
7272

0 commit comments

Comments
 (0)