Skip to content

Commit ef2b7ca

Browse files
authored
Merge branch 'main' into add-release-agent
2 parents 5a2a7f0 + dde634d commit ef2b7ca

26 files changed

Lines changed: 2154 additions & 1307 deletions

.github/copilot-instructions.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copilot Instructions for vscode-python-debugger
2+
3+
## Learnings
4+
5+
- Always use `run.executable` (the actual Python binary path) instead of `activatedRun.executable` for interpreter identification in `getInterpreterDetails`, `getSettingsPythonPath`, and `getExecutableCommand`. `activatedRun.executable` may be a wrapper command (e.g. `pixi run python`) set by environment managers like pixi or conda, which breaks the debugger if used as a replacement for the binary. (1)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
description: When creating pull requests
3+
---
4+
5+
# PR Creation Skill
6+
7+
When creating pull requests, always include one of these labels:
8+
9+
- `bug` — for bug fixes
10+
- `debt` — for technical debt improvements

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
},
2323
"git.branchProtection": ["main"],
2424
"git.branchRandomName.enable": true,
25-
"python-envs.defaultEnvManager": "ms-python.python:system",
25+
"python-envs.defaultEnvManager": "ms-python.python:venv",
2626
"python-envs.pythonProjects": []
2727
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,24 @@ resources:
1616
type: git
1717
name: 1ESPipelineTemplates/MicroBuildTemplate
1818
ref: refs/tags/release
19+
20+
- repository: templates
21+
type: git
22+
name: DevDiv/Pylance-Eng
23+
ref: refs/heads/main
1924
variables:
2025
- name: TeamName
2126
value: VSCode-python-debugger
2227
- name: VsixName
2328
value: python-debugger.vsix
2429
- name: AZURE_ARTIFACTS_FEED
2530
value: 'https://devdiv.pkgs.visualstudio.com/DevDiv/_packaging/Pylance_PublicPackages/npm/registry/'
31+
2632
parameters:
2733
- name: publishExtension
2834
displayName: 🚀 Publish Extension
2935
type: boolean
30-
default: false
36+
default: true
3137

3238
- name: buildPlatforms
3339
type: object
@@ -102,7 +108,7 @@ extends:
102108
- stage: Build
103109
displayName: Build & Package Extension
104110
jobs:
105-
- template: build/templates/package.yml@self
111+
- template: azure-pipelines/extension/templates/jobs/package.yml@templates
106112
parameters:
107113
buildPlatforms: ${{ parameters.buildPlatforms }}
108114
buildSteps: ${{ parameters.buildSteps }}
@@ -114,7 +120,7 @@ extends:
114120
displayName: Publish Extension
115121
dependsOn: Build
116122
jobs:
117-
- template: build/templates/publish-extension.yml@self
123+
- template: azure-pipelines/extension/templates/jobs/publish-extension.yml@templates
118124
parameters:
119125
buildPlatforms: ${{ parameters.buildPlatforms }}
120126
publishExtension: ${{ parameters.publishExtension }}

build/azure-devdiv-pipeline.stable.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ resources:
1313
type: git
1414
name: 1ESPipelineTemplates/MicroBuildTemplate
1515
ref: refs/tags/release
16+
17+
- repository: templates
18+
type: git
19+
name: DevDiv/Pylance-Eng
20+
ref: refs/heads/main
1621
variables:
1722
- name: TeamName
1823
value: VSCode-python-debugger
@@ -100,21 +105,25 @@ extends:
100105
- stage: Build
101106
displayName: Build & Package Extension
102107
jobs:
103-
- template: build/templates/package.yml@self
108+
- template: azure-pipelines/extension/templates/jobs/package.yml@templates
104109
parameters:
105110
buildPlatforms: ${{ parameters.buildPlatforms }}
106111
buildSteps: ${{ parameters.buildSteps }}
107112
isPreRelease: false
113+
standardizedVersioning: true
108114
customNPMRegistry: $(AZURE_ARTIFACTS_FEED)
109115

110116
- stage: Publish
111117
displayName: Publish Extension
112118
dependsOn: Build
113119
jobs:
114-
- template: build/templates/publish-extension.yml@self
120+
- template: azure-pipelines/extension/templates/jobs/publish-extension.yml@templates
115121
parameters:
116122
buildPlatforms: ${{ parameters.buildPlatforms }}
117123
publishExtension: ${{ parameters.publishExtension }}
118124
preRelease: false
119125
teamName: $(TeamName)
126+
ghCreateTag: true
127+
ghCreateRelease: true
128+
ghReleaseAddChangeLog: true
120129
customNPMRegistry: $(AZURE_ARTIFACTS_FEED)
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# PR and Push validation pipeline
2+
3+
trigger:
4+
branches:
5+
include:
6+
- main
7+
- release
8+
- release/*
9+
- release-*
10+
11+
pr:
12+
branches:
13+
include:
14+
- main
15+
- release
16+
- release/*
17+
- release-*
18+
drafts: false
19+
20+
resources:
21+
repositories:
22+
- repository: MicroBuildTemplate
23+
type: git
24+
name: 1ESPipelineTemplates/MicroBuildTemplate
25+
ref: refs/tags/release
26+
27+
- repository: templates
28+
type: git
29+
name: DevDiv/Pylance-Eng
30+
ref: refs/heads/main
31+
variables:
32+
- name: TeamName
33+
value: VSCode-python-debugger
34+
- name: VsixName
35+
value: python-debugger.vsix
36+
- name: AZURE_ARTIFACTS_FEED
37+
value: 'https://devdiv.pkgs.visualstudio.com/DevDiv/_packaging/Pylance_PublicPackages/npm/registry/'
38+
39+
parameters:
40+
- name: buildSteps
41+
type: stepList
42+
default:
43+
- script: npm ci
44+
displayName: Install NPM dependencies
45+
46+
- script: python -m pip install -U pip
47+
displayName: Upgrade pip
48+
49+
- script: python -m pip install wheel
50+
displayName: Install wheel
51+
52+
- script: python -m pip install nox
53+
displayName: Install nox
54+
55+
- script: python -m nox --session install_bundled_libs
56+
displayName: Install Python dependencies
57+
58+
- script: npm run package
59+
displayName: Build extension
60+
61+
extends:
62+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
63+
parameters:
64+
sdl:
65+
enabled: false
66+
pool:
67+
name: AzurePipelines-EO
68+
os: windows
69+
70+
customBuildTags:
71+
- ES365AIMigrationTooling
72+
stages:
73+
- stage: Build
74+
displayName: Build & Package Extension
75+
jobs:
76+
- template: azure-pipelines/extension/templates/jobs/package.yml@templates
77+
parameters:
78+
buildSteps: ${{ parameters.buildSteps }}
79+
isPreRelease: false
80+
standardizedVersioning: true
81+
customNPMRegistry: $(AZURE_ARTIFACTS_FEED)

build/update_ext_version.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ def main(package_json: pathlib.Path, argv: Sequence[str]) -> None:
8282
if args.build_id:
8383
# If build id is provided it should fall within the 0-INT32 max range
8484
# that the max allowed value for publishing to the Marketplace.
85-
if args.build_id < 0 or (
86-
args.for_publishing and args.build_id > ((2**32) - 1)
87-
):
85+
if args.build_id < 0 or (args.for_publishing and args.build_id > ((2**32) - 1)):
8886
raise ValueError(f"Build ID must be within [0, {(2**32) - 1}]")
8987

9088
package["version"] = ".".join((major, minor, str(args.build_id)))

debugpy_info.json

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)