Skip to content

Commit b66af0d

Browse files
committed
Add support for python-environment-tools build (#23573)
1 parent b39ed20 commit b66af0d

File tree

86 files changed

+175
-4319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+175
-4319
lines changed

.github/workflows/build.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@ jobs:
8484
- name: Checkout
8585
uses: actions/checkout@v4
8686

87+
- name: Checkout Python Environment Tools
88+
uses: actions/checkout@v4
89+
with:
90+
repository: 'microsoft/python-environment-tools'
91+
path: 'python-env-tools'
92+
sparse-checkout: |
93+
crates
94+
Cargo.toml
95+
Cargo.lock
96+
sparse-checkout-cone-mode: false
97+
8798
- name: Build VSIX
8899
uses: ./.github/actions/build-vsix
89100
with:
@@ -201,6 +212,17 @@ jobs:
201212
with:
202213
path: ${{ env.special-working-directory-relative }}
203214

215+
- name: Checkout Python Environment Tools
216+
uses: actions/checkout@v4
217+
with:
218+
repository: 'microsoft/python-environment-tools'
219+
path: ${{ env.special-working-directory-relative }}/python-env-tools
220+
sparse-checkout: |
221+
crates
222+
Cargo.toml
223+
Cargo.lock
224+
sparse-checkout-cone-mode: false
225+
204226
- name: Install Node
205227
uses: actions/setup-node@v4
206228
with:
@@ -382,6 +404,17 @@ jobs:
382404
- name: Checkout
383405
uses: actions/checkout@v4
384406

407+
- name: Checkout Python Environment Tools
408+
uses: actions/checkout@v4
409+
with:
410+
repository: 'microsoft/python-environment-tools'
411+
path: ${{ env.special-working-directory-relative }}/python-env-tools
412+
sparse-checkout: |
413+
crates
414+
Cargo.toml
415+
Cargo.lock
416+
sparse-checkout-cone-mode: false
417+
385418
- name: Smoke tests
386419
uses: ./.github/actions/smoke-tests
387420
with:

.github/workflows/pr-check.yml

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,17 @@ jobs:
9090
- name: Checkout
9191
uses: actions/checkout@v4
9292

93+
- name: Checkout Python Environment Tools
94+
uses: actions/checkout@v4
95+
with:
96+
repository: 'microsoft/python-environment-tools'
97+
path: 'python-env-tools'
98+
sparse-checkout: |
99+
crates
100+
Cargo.toml
101+
Cargo.lock
102+
sparse-checkout-cone-mode: false
103+
93104
- name: Install base Python requirements
94105
uses: brettcannon/pip-secure-install@v1
95106
with:
@@ -186,6 +197,17 @@ jobs:
186197
with:
187198
path: ${{ env.special-working-directory-relative }}
188199

200+
- name: Checkout Python Environment Tools
201+
uses: actions/checkout@v4
202+
with:
203+
repository: 'microsoft/python-environment-tools'
204+
path: ${{ env.special-working-directory-relative }}/python-env-tools
205+
sparse-checkout: |
206+
crates
207+
Cargo.toml
208+
Cargo.lock
209+
sparse-checkout-cone-mode: false
210+
189211
- name: Install Node
190212
uses: actions/setup-node@v4
191213
with:
@@ -363,9 +385,20 @@ jobs:
363385
with:
364386
path: ${{ env.special-working-directory-relative }}
365387

366-
- name: Native Locator tests
388+
- name: Checkout Python Environment Tools
389+
uses: actions/checkout@v4
390+
with:
391+
repository: 'microsoft/python-environment-tools'
392+
path: ${{ env.special-working-directory-relative }}/python-env-tools
393+
sparse-checkout: |
394+
crates
395+
Cargo.toml
396+
Cargo.lock
397+
sparse-checkout-cone-mode: false
398+
399+
- name: Python Environment Tools tests
367400
run: cargo test -- --nocapture
368-
working-directory: ${{ env.special-working-directory }}/native_locator
401+
working-directory: ${{ env.special-working-directory }}/python-env-tools
369402

370403
smoke-tests:
371404
name: Smoke tests
@@ -388,6 +421,17 @@ jobs:
388421
- name: Checkout
389422
uses: actions/checkout@v4
390423

424+
- name: Checkout Python Environment Tools
425+
uses: actions/checkout@v4
426+
with:
427+
repository: 'microsoft/python-environment-tools'
428+
path: python-env-tools
429+
sparse-checkout: |
430+
crates
431+
Cargo.toml
432+
Cargo.lock
433+
sparse-checkout-cone-mode: false
434+
391435
- name: Smoke tests
392436
uses: ./.github/actions/smoke-tests
393437
with:
@@ -409,6 +453,17 @@ jobs:
409453
- name: Checkout
410454
uses: actions/checkout@v4
411455

456+
- name: Checkout Python Environment Tools
457+
uses: actions/checkout@v4
458+
with:
459+
repository: 'microsoft/python-environment-tools'
460+
path: python-env-tools
461+
sparse-checkout: |
462+
crates
463+
Cargo.toml
464+
Cargo.lock
465+
sparse-checkout-cone-mode: false
466+
412467
- name: Install Node
413468
uses: actions/setup-node@v4
414469
with:

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,4 @@ dist/**
4848
*.xlf
4949
package.nls.*.json
5050
l10n/
51-
native_locator/target/**
52-
native_locator/Cargo.lock
51+
python-env-tools/**

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@
7373
"python.testing.unittestEnabled": false,
7474
"python.testing.pytestEnabled": true,
7575
"rust-analyzer.linkedProjects": [
76-
".\\native_locator\\Cargo.toml"
76+
".\\python-env-tools\\Cargo.toml"
7777
]
7878
}

.vscodeignore

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ test/**
6767
tmp/**
6868
typings/**
6969
types/**
70-
native_locator/.vscode/**
71-
native_locator/src/**
72-
native_locator/tests/**
73-
native_locator/bin/**
74-
native_locator/target/**
75-
native_locator/Cargo.*
70+
python-env-tools/.github/**
71+
python-env-tools/.vscode/**
72+
python-env-tools/crates/**
73+
python-env-tools/target/**
74+
python-env-tools/Cargo.*

build/azure-pipeline.pre-release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ resources:
1818
ref: main
1919
endpoint: Monaco
2020

21+
- repository: python-environment-tools
22+
type: github
23+
name: microsoft/python-environment-tools
24+
ref: main
25+
endpoint: Monaco
26+
path: vscode-python/python-env-tools
27+
2128
parameters:
2229
- name: publishExtension
2330
displayName: 🚀 Publish Extension

native_locator/Cargo.toml

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

native_locator/src/common_python.rs

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

0 commit comments

Comments
 (0)