Skip to content

Commit 5c23d90

Browse files
Merge branch 'main' of github.com:microsoft/vscode-python into use-python-debugger-api
2 parents fe82fea + fc49f2b commit 5c23d90

File tree

5 files changed

+25
-77
lines changed

5 files changed

+25
-77
lines changed

.github/actions/build-vsix/action.yml

+3-17
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ runs:
2929
cache: 'pip'
3030
cache-dependency-path: |
3131
requirements.txt
32-
build/build-install-requirements.txt
3332
python_files/jedilsp_requirements/requirements.txt
3433
3534
- name: Upgrade Pip
@@ -38,26 +37,13 @@ runs:
3837

3938
# For faster/better builds of sdists.
4039
- name: Install build pre-requisite
41-
run: python -m pip install wheel
40+
run: python -m pip install wheel nox
4241
shell: bash
4342

44-
- name: Install Python dependencies
45-
uses: brettcannon/pip-secure-install@v1
46-
with:
47-
options: '-t ./python_files/lib/python --implementation py'
48-
49-
- name: Get-pip
50-
run: |
51-
python -m pip --disable-pip-version-check install packaging
52-
python ./python_files/download_get_pip.py
43+
- name: Install Python Extension dependencies (jedi, debugpy, etc.)
44+
run: nox --session install_python_libs
5345
shell: bash
5446

55-
- name: Install Jedi LSP
56-
uses: brettcannon/pip-secure-install@v1
57-
with:
58-
requirements-file: './python_files/jedilsp_requirements/requirements.txt'
59-
options: '-t ./python_files/lib/jedilsp --implementation py --platform any --abi none'
60-
6147
- name: Run npm ci
6248
run: npm ci --prefer-offline
6349
shell: bash

.github/workflows/build.yml

+7-18
Original file line numberDiff line numberDiff line change
@@ -187,26 +187,15 @@ jobs:
187187
with:
188188
python-version: ${{ matrix.python }}
189189

190-
- name: Download get-pip.py
191-
run: |
192-
python -m pip install wheel
193-
python -m pip install -r build/build-install-requirements.txt
194-
python ./python_files/download_get_pip.py
195-
shell: bash
190+
- name: Upgrade Pip
191+
run: python -m pip install -U pip
196192

197-
- name: Install core Python requirements
198-
uses: brettcannon/pip-secure-install@v1
199-
with:
200-
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
201-
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
202-
if: startsWith(matrix.python, 3.)
193+
# For faster/better builds of sdists.
194+
- name: Install build pre-requisite
195+
run: python -m pip install wheel nox
203196

204-
- name: Install Jedi requirements
205-
uses: brettcannon/pip-secure-install@v1
206-
with:
207-
requirements-file: '"${{ env.special-working-directory-relative }}/python_files/jedilsp_requirements/requirements.txt"'
208-
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/jedilsp" --no-cache-dir --implementation py'
209-
if: startsWith(matrix.python, 3.)
197+
- name: Install Python Extension dependencies (jedi, debugpy, etc.)
198+
run: nox --session install_python_libs
210199

211200
- name: Install test requirements
212201
run: python -m pip install --upgrade -r build/test-requirements.txt

.github/workflows/pr-check.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -175,24 +175,15 @@ jobs:
175175
with:
176176
python-version: ${{ matrix.python }}
177177

178-
- name: Download get-pip.py
179-
run: |
180-
python -m pip install wheel
181-
python -m pip install -r build/build-install-requirements.txt
182-
python ./python_files/download_get_pip.py
183-
shell: bash
178+
- name: Upgrade Pip
179+
run: python -m pip install -U pip
184180

185-
- name: Install base Python requirements
186-
uses: brettcannon/pip-secure-install@v1
187-
with:
188-
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
189-
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
181+
# For faster/better builds of sdists.
182+
- name: Install build pre-requisite
183+
run: python -m pip install wheel nox
190184

191-
- name: Install Jedi requirements
192-
uses: brettcannon/pip-secure-install@v1
193-
with:
194-
requirements-file: '"${{ env.special-working-directory-relative }}/python_files/jedilsp_requirements/requirements.txt"'
195-
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/jedilsp" --no-cache-dir --implementation py'
185+
- name: Install Python Extension dependencies (jedi, debugpy, etc.)
186+
run: nox --session install_python_libs
196187

197188
- name: Install test requirements
198189
run: python -m pip install --upgrade -r build/test-requirements.txt

build/azure-pipeline.pre-release.yml

+4-13
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,12 @@ extends:
4949
- script: python -m pip install -U pip
5050
displayName: Upgrade pip
5151

52-
- script: python -m pip install wheel
53-
displayName: Install wheel
52+
- script: python -m pip install wheel nox
53+
displayName: Install wheel and nox
5454

5555
- script: |
56-
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
57-
python ./python_files/download_get_pip.py
58-
displayName: Get-pip.py
59-
60-
- script: |
61-
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt
62-
displayName: Install Python dependencies
63-
64-
- script: |
65-
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/jedilsp --implementation py --platform any --abi none -r ./python_files/jedilsp_requirements/requirements.txt
66-
displayName: Install Jedi Language Server
56+
nox --session install_python_libs
57+
displayName: Install debugpy, Jedi, get-pip, etc
6758
6859
- script: |
6960
python ./build/update_ext_version.py --for-publishing

build/azure-pipeline.stable.yml

+4-13
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,12 @@ extends:
4444
- script: python -m pip install -U pip
4545
displayName: Upgrade pip
4646

47-
- script: python -m pip install wheel
48-
displayName: Install wheel
47+
- script: python -m pip install wheel nox
48+
displayName: Install wheel and nox
4949

5050
- script: |
51-
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
52-
python ./python_files/download_get_pip.py
53-
displayName: Get-pip.py
54-
55-
- script: |
56-
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt
57-
displayName: Install Python dependencies
58-
59-
- script: |
60-
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/jedilsp --implementation py --platform any --abi none -r ./python_files/jedilsp_requirements/requirements.txt
61-
displayName: Install Jedi Language Server
51+
nox --session install_python_libs
52+
displayName: Install debugpy, Jedi, get-pip, etc
6253
6354
- script: |
6455
python ./build/update_ext_version.py --release --for-publishing

0 commit comments

Comments
 (0)