Skip to content

Commit fe82fea

Browse files
remove debugpy installation
1 parent 0c15132 commit fe82fea

File tree

12 files changed

+6
-145
lines changed

12 files changed

+6
-145
lines changed

.github/ISSUE_TEMPLATE/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ contact_links:
99
- name: 'Jupyter'
1010
url: https://github.com/microsoft/vscode-jupyter/issues
1111
about: 'For issues relating to the Jupyter extension (including the interactive window)'
12-
- name: 'Debugpy'
13-
url: https://github.com/microsoft/debugpy/issues
14-
about: 'For issues relating to the debugpy debugger'
12+
- name: 'Python Debugger'
13+
url: https://github.com/microsoft/vscode-python-debugger/issues
14+
about: 'For issues relating to the Python debugger'
1515
- name: Help/Support
1616
url: https://github.com/microsoft/vscode-python/discussions/categories/q-a
1717
about: 'Having trouble with the extension? Need help getting something to work?'

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ runs:
4646
with:
4747
options: '-t ./python_files/lib/python --implementation py'
4848

49-
- name: Install debugpy and get-pip
49+
- name: Get-pip
5050
run: |
5151
python -m pip --disable-pip-version-check install packaging
52-
python ./python_files/install_debugpy.py
5352
python ./python_files/download_get_pip.py
5453
shell: bash
5554

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

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ runs:
3939
- name: pip install system test requirements
4040
run: |
4141
python -m pip install --upgrade -r build/test-requirements.txt
42-
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
4342
shell: bash
4443

4544
# Bits from the VSIX are reused by smokeTest.ts to speed things up.

.github/workflows/build.yml

-14
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ jobs:
9797

9898
- name: Install other Python requirements
9999
run: |
100-
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
101100
python -m pip install --upgrade -r build/test-requirements.txt
102101
103102
- name: Run Pyright
@@ -195,11 +194,6 @@ jobs:
195194
python ./python_files/download_get_pip.py
196195
shell: bash
197196

198-
- name: Install debugpy
199-
run: |
200-
# We need to have debugpy so that tests relying on it keep passing, but we don't need install_debugpy's logic in the test phase.
201-
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
202-
203197
- name: Install core Python requirements
204198
uses: brettcannon/pip-secure-install@v1
205199
with:
@@ -217,14 +211,6 @@ jobs:
217211
- name: Install test requirements
218212
run: python -m pip install --upgrade -r build/test-requirements.txt
219213

220-
- name: Install debugpy wheels (Python ${{ matrix.python }})
221-
run: |
222-
python -m pip install wheel
223-
python -m pip install -r build/build-install-requirements.txt
224-
python ./python_files/install_debugpy.py
225-
shell: bash
226-
if: matrix.test-suite == 'debugger'
227-
228214
- name: Install functional test requirements
229215
run: python -m pip install --upgrade -r ./build/functional-test-requirements.txt
230216
if: matrix.test-suite == 'functional'

.github/workflows/pr-check.yml

-19
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ jobs:
7171

7272
- name: Install other Python requirements
7373
run: |
74-
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
7574
python -m pip install --upgrade -r build/test-requirements.txt
7675
7776
- name: Run Pyright
@@ -176,11 +175,6 @@ jobs:
176175
with:
177176
python-version: ${{ matrix.python }}
178177

179-
- name: Install debugpy
180-
run: |
181-
# We need to have debugpy so that tests relying on it keep passing, but we don't need install_debugpy's logic in the test phase.
182-
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
183-
184178
- name: Download get-pip.py
185179
run: |
186180
python -m pip install wheel
@@ -203,14 +197,6 @@ jobs:
203197
- name: Install test requirements
204198
run: python -m pip install --upgrade -r build/test-requirements.txt
205199

206-
- name: Install debugpy wheels (Python ${{ matrix.python }})
207-
run: |
208-
python -m pip install wheel
209-
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
210-
python ./python_files/install_debugpy.py
211-
shell: bash
212-
if: matrix.test-suite == 'debugger'
213-
214200
- name: Install functional test requirements
215201
run: python -m pip install --upgrade -r ./build/functional-test-requirements.txt
216202
if: matrix.test-suite == 'functional'
@@ -408,11 +394,6 @@ jobs:
408394
requirements-file: './python_files/jedilsp_requirements/requirements.txt'
409395
options: '-t ./python_files/lib/jedilsp --implementation py'
410396

411-
- name: Install debugpy
412-
run: |
413-
# We need to have debugpy so that tests relying on it keep passing, but we don't need install_debugpy's logic in the test phase.
414-
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
415-
416397
- name: Install test requirements
417398
run: python -m pip install --upgrade -r build/test-requirements.txt
418399

build/azure-pipeline.pre-release.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ extends:
5454

5555
- script: |
5656
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
57-
python ./python_files/install_debugpy.py
5857
python ./python_files/download_get_pip.py
59-
displayName: Install debugpy and get-pip.py
58+
displayName: Get-pip.py
6059
6160
- script: |
6261
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt

build/azure-pipeline.stable.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ extends:
4949

5050
- script: |
5151
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
52-
python ./python_files/install_debugpy.py
5352
python ./python_files/download_get_pip.py
54-
displayName: Install debugpy and get-pip.py
53+
displayName: Get-pip.py
5554
5655
- script: |
5756
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt

noxfile.py

-7
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ def install_python_libs(session: nox.Session):
3232

3333
session.install("packaging")
3434

35-
# Install debugger
36-
session.run(
37-
"python",
38-
"./python_files/install_debugpy.py",
39-
env={"PYTHONPATH": "./python_files/lib/temp"},
40-
)
41-
4235
# Download get-pip script
4336
session.run(
4437
"python",

python_files/install_debugpy.py

-66
This file was deleted.

python_files/pyproject.toml

-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ extraPaths = ['lib/python', 'lib/jedilsp']
1616
ignore = [
1717
# Ignore all pre-existing code with issues
1818
'get-pip.py',
19-
'install_debugpy.py',
2019
'tensorboard_launcher.py',
2120
'testlauncher.py',
2221
'visualstudio_py_testlauncher.py',
2322
'testing_tools/unittest_discovery.py',
2423
'testing_tools/adapter/util.py',
2524
'testing_tools/adapter/pytest/_discovery.py',
2625
'testing_tools/adapter/pytest/_pytest_item.py',
27-
'tests/debug_adapter/test_install_debugpy.py',
2826
'tests/testing_tools/adapter/.data',
2927
'tests/testing_tools/adapter/test___main__.py',
3028
'tests/testing_tools/adapter/test_discovery.py',

python_files/tests/debug_adapter/__init__.py

-2
This file was deleted.

python_files/tests/debug_adapter/test_install_debugpy.py

-25
This file was deleted.

0 commit comments

Comments
 (0)