Skip to content

Commit aa64a98

Browse files
paulacamargo25dependabot[bot]lramos15luabudDonJayamanne
authored
Update branch for debugpy 1.5.1 with last changes in main (#124)
* update pre release (#71) * Add port provider (#85) * Add port attribute provider * Add message * Enabled proposed api * Ignore all the ports * Fix format * fix pr comments * Add regex for terminal command * Add adapter to pattern * Add global configuration for justMyCode (#91) * Aff configuration * Read just my code from settings too * fix tests * fix lint * Update extension name (#84) * Update package.json * Fix readme * update debug type name * Fix tests * Fix lint * Fix test * Update translations * revert extension id * Fix tests * fix lint * Update debug type name * Fix translations and lint * update debug type * fix lint * use version 1.7 (#95) * Remove default justMyCode (#100) * Fix error in workspace (#101) * Fix error in workspace * fix test and lint * Fix format * Bump mheap/github-action-required-labels from 3 to 5 (#23) Bumps [mheap/github-action-required-labels](https://github.com/mheap/github-action-required-labels) from 3 to 5. - [Release notes](https://github.com/mheap/github-action-required-labels/releases) - [Commits](mheap/github-action-required-labels@v3...v5) --- updated-dependencies: - dependency-name: mheap/github-action-required-labels dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @typescript-eslint/parser from 5.59.11 to 5.62.0 (#61) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.59.11 to 5.62.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump typescript from 5.1.3 to 5.2.2 (#79) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.1.3 to 5.2.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v5.1.3...v5.2.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update npm packages (#105) * update package.json * Fux lint * Update to node 18 (#106) * Platform-specific vsix (#89) * Update nox file and pre release * update args * update value * see params * echo vars * fix args * fix args * Fix error obj to string * fix command line error * update args * update how access values * Add args * Send arguments * tried ith arguments * update value * remove args extra * update run * send as env * add to see other values * update env variables * use VSCETARGET * fix variable * Fix macOs error * Fix lint in nox file * Fix nox hash comparison * Fix default value * Remove unnecessary code * Update platform url and debugpy version * Fix dict key name * Remove vsix for all platforms * Fix pr comments * fix download function * fix hash code * Read from json pypypackage * add json file and session that creates it * Reformat nox file * resolve comments * fix lint error * update pipeline * fix build error * dont hardcode the hash * Fix GDPR comments (#113) * Update readme (#111) * Update readme * Update README.md Co-authored-by: Luciana Abud <[email protected]> --------- Co-authored-by: Luciana Abud <[email protected]> * Remove build folder from bundled vsix (#120) * Update debugpy version * Update nox and pipelines * update json file * fix actions * fix 3.6 error * fix error running with 3.6 * fix lint * update python version * fix error in lint pipeline * update pipelines * fix nox file * fix tests * fix pipeline error * fix lint * use python 3.6 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Logan Ramos <[email protected]> Co-authored-by: Luciana Abud <[email protected]> Co-authored-by: Don Jayamanne <[email protected]>
1 parent b5b9c48 commit aa64a98

Some content is hidden

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

55 files changed

+1435
-858
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ runs:
1515
node-version: ${{ inputs.node_version }}
1616
cache: 'npm'
1717

18-
# Minimum supported version is Python 3.7
19-
- name: Use Python 3.7
18+
- name: Use Python 3.6
2019
uses: actions/setup-python@v4
2120
with:
22-
python-version: 3.7
21+
python-version: 3.6
2322

2423
- name: Pip cache
2524
uses: actions/cache@v3
@@ -30,23 +29,23 @@ runs:
3029
${{ runner.os }}-pip-build-vsix-
3130
3231
# For faster/better builds of sdists.
33-
- name: Update pip, install pipx and install wheel
34-
run: python -m pip install -U pip pipx wheel
32+
- name: Update pip, install nox and install wheel
33+
run: python -m pip install -U pip nox wheel
3534
shell: bash
3635

3736
- name: Run npm ci
3837
run: npm ci --prefer-offline
3938
shell: bash
4039

4140
- name: Install bundled python libraries
42-
run: pipx run nox --session install_old_bundled_libs
41+
run: python -m nox --session install_bundled_libs
4342
shell: bash
4443

4544
# Use the GITHUB_RUN_ID environment variable to update the build number.
4645
# GITHUB_RUN_ID is a unique number for each run within a repository.
4746
# This number does not change if you re-run the workflow run.
4847
- name: Update extension build number
49-
run: pipx run nox --session update_build_number -- $GITHUB_RUN_ID
48+
run: python -m nox --session update_build_number -- $GITHUB_RUN_ID
5049
shell: bash
5150

5251
- name: Build VSIX

.github/actions/lint/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ runs:
4141
${{ runner.os }}-pip-lint-
4242
4343
# For faster/better builds of sdists.
44-
- name: Update pip, install pipx and install wheel
45-
run: python -m pip install -U pip pipx wheel
44+
- name: Update pip, install nox and install wheel
45+
run: python -m pip install -U pip nox wheel
4646
shell: bash
4747

4848
# This will install libraries to a target directory.
4949
- name: Install bundled python libraries
50-
run: pipx run nox --session install_old_bundled_libs
50+
run: python -m nox --session install_bundled_libs
5151
shell: bash
5252

5353
- name: Check linting and formatting
54-
run: pipx run nox --session lint
54+
run: python -m nox --session lint
5555
shell: bash

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
analyze:
2525
name: Analyze
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-20.04
2727
permissions:
2828
actions: read
2929
contents: read

.github/workflows/issue-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# From https://github.com/marketplace/actions/github-script#apply-a-label-to-an-issue.
1212
add-triage-label:
1313
name: "Add 'triage-needed'"
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-20.04
1515
steps:
1616
- uses: actions/github-script@v6
1717
with:

.github/workflows/pr-check.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55

66
env:
7-
NODE_VERSION: 16.17.0
7+
NODE_VERSION: 18.17.1
88
TEST_RESULTS_DIRECTORY: .
99
# Force a path with spaces and unicode chars to test extension works in these scenarios
1010
special-working-directory: './🐍 🐛'
@@ -13,7 +13,7 @@ env:
1313
jobs:
1414
build-vsix:
1515
name: Create VSIX
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-20.04
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
2525

2626
lint:
2727
name: Lint
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-20.04
2929
steps:
3030
- name: Checkout
3131
uses: actions/checkout@v3
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
os: [ubuntu-latest, windows-latest]
47+
os: [ubuntu-20.04, windows-latest]
4848
python: ['3.6']
4949

5050
steps:
@@ -53,19 +53,18 @@ jobs:
5353
with:
5454
path: ${{ env.special-working-directory-relative }}
5555

56-
# Install bundled libs using 3.6 even though you test it on other versions.
5756
- name: Use Python 3.6
58-
uses: actions/setup-python@v4
57+
uses: actions/setup-python@v3
5958
with:
6059
python-version: '3.6'
6160

62-
- name: Update pip, install pipx and install wheel
63-
run: python -m pip install -U pip pipx wheel
61+
- name: Update pip, install nox and install wheel
62+
run: python -m pip install -U pip nox wheel
6463
shell: bash
6564

6665
# This will install libraries to a target directory.
6766
- name: Install bundled python libraries
68-
run: pipx run nox --session install_old_bundled_libs
67+
run: python -m nox --session install_bundled_libs
6968
shell: bash
7069

7170
- name: Install Node
@@ -78,16 +77,16 @@ jobs:
7877
- name: Install dependencies (npm ci)
7978
run: npm ci
8079

81-
# Now that the bundle is installed to target using python 3.7
80+
# Now that the bundle is installed to target using python 3.6
8281
# switch back the python we want to test with
8382
- name: Use Python ${{ matrix.python }}
84-
uses: actions/setup-python@v4
83+
uses: actions/setup-python@v3
8584
with:
8685
python-version: ${{ matrix.python }}
8786

8887
# The new python may not have nox so install it again
89-
- name: Update pip, install pipx and install wheel (again)
90-
run: python -m pip install -U pip pipx wheel
88+
- name: Update pip, install nox and install wheel (again)
89+
run: python -m pip install -U pip nox wheel
9190
shell: bash
9291

9392
- name: Start xvfb on Linux
@@ -98,7 +97,7 @@ jobs:
9897
if: ${{ runner.os }} == 'Linux'
9998

10099
- name: Run tests
101-
run: pipx run nox --session tests
100+
run: python -m nox --session tests
102101
shell: bash
103102
env:
104103
DISPLAY: ${{ env.DISPLAY }}

.github/workflows/pr-labels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ on:
1111
jobs:
1212
add-pr-label:
1313
name: 'Ensure Required Labels'
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-20.04
1515
steps:
1616
- name: 'PR impact specified'
17-
uses: mheap/github-action-required-labels@v3
17+
uses: mheap/github-action-required-labels@v5
1818
with:
1919
mode: exactly
2020
count: 1

.github/workflows/push-check.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- 'release-*'
1010

1111
env:
12-
NODE_VERSION: 16.17.0
12+
NODE_VERSION: 18.17.1
1313
TEST_RESULTS_DIRECTORY: .
1414
# Force a path with spaces and unicode chars to test extension works in these scenarios
1515
special-working-directory: './🐍 🐛'
@@ -18,7 +18,7 @@ env:
1818
jobs:
1919
build-vsix:
2020
name: Create VSIX
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-20.04
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v3
@@ -30,7 +30,7 @@ jobs:
3030

3131
lint:
3232
name: Lint
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-20.04
3434
steps:
3535
- name: Checkout
3636
uses: actions/checkout@v3
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
fail-fast: false
5151
matrix:
52-
os: [ubuntu-latest, windows-latest]
52+
os: [ubuntu-20.04, windows-latest]
5353
python: ['3.6']
5454

5555
steps:
@@ -58,19 +58,18 @@ jobs:
5858
with:
5959
path: ${{ env.special-working-directory-relative }}
6060

61-
# Install bundled libs using 3.6 even though you test it on other versions.
6261
- name: Use Python 3.6
63-
uses: actions/setup-python@v4
62+
uses: actions/setup-python@v3
6463
with:
6564
python-version: '3.6'
6665

67-
- name: Update pip, install pipx and install wheel
68-
run: python -m pip install -U pip pipx wheel
66+
- name: Update pip, install nox and install wheel
67+
run: python -m pip install -U pip nox wheel
6968
shell: bash
7069

7170
# This will install libraries to a target directory.
7271
- name: Install bundled python libraries
73-
run: pipx run nox --session install_old_bundled_libs
72+
run: python -m nox --session install_bundled_libs
7473
shell: bash
7574

7675
- name: Install Node
@@ -83,16 +82,16 @@ jobs:
8382
- name: Install dependencies (npm ci)
8483
run: npm ci
8584

86-
# Now that the bundle is installed to target using python 3.7
85+
# Now that the bundle is installed to target using python 3.6
8786
# switch back the python we want to test with
8887
- name: Use Python ${{ matrix.python }}
89-
uses: actions/setup-python@v4
88+
uses: actions/setup-python@v3
9089
with:
9190
python-version: ${{ matrix.python }}
9291

9392
# The new python may not have nox so install it again
94-
- name: Update pip, install pipx and install wheel (again)
95-
run: python -m pip install -U pip pipx wheel
93+
- name: Update pip, install nox and install wheel (again)
94+
run: python -m pip install -U pip nox wheel
9695
shell: bash
9796

9897
- name: Start xvfb on Linux
@@ -103,5 +102,5 @@ jobs:
103102
if: ${{ runner.os }} == 'Linux'
104103

105104
- name: Run tests
106-
run: pipx run nox --session tests
105+
run: python -m nox --session tests
107106
shell: bash

.vscodeignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.vscode/**
22
.vscode-test/**
3+
build/**
34
out/**
45
node_modules/**
56
src/**
@@ -20,4 +21,4 @@ noxfile.py
2021
.pytest_cache/**
2122
.pylintrc
2223
**/requirements.txt
23-
**/requirements.in
24+
**/requirements.in

README.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,37 @@
1-
# Debugpy extension for Visual Studio Code
1+
# Python Debugger extension for Visual Studio Code
22

3-
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) that supports Python debugging with debugpy. debugpy provides a seamless debugging experience by allowing you to set breakpoints, step through code, inspect variables, and perform other essential debugging tasks. The debugy extension offers debugging support for various types of Python applications including scripts, web applications, remote processes, and multi-threaded processes.
3+
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) that supports Python debugging with debugpy. Python Debugger provides a seamless debugging experience by allowing you to set breakpoints, step through code, inspect variables, and perform other essential debugging tasks. The debugy extension offers debugging support for various types of Python applications including scripts, web applications, remote processes, and multi-threaded processes.
44

55
Note:
6-
- The Python extension offers the debugpy extension as an optional installation, including it during the setup process.
6+
- The Python extension offers the python debugger extension as an optional installation, including it during the setup process.
77
- This extension is supported for all [actively supported versions](https://devguide.python.org/#status-of-python-branches) of the Python language (i.e., Python >= 3.7).
88

9+
10+
## Purpose
11+
12+
The main intent of this extension is to offer:
13+
14+
1. **Independence and Compatibility:** The Python Debugger extension aims to separate the debugging functionality from the main Python extension to prevent compatibility issues. This ensures that even as the Python extension drops support for older Python versions (e.g., Python 3.7), you can continue debugging projects with those versions without downgrading your Python extension. This allows you to access new features and bug fixes while keeping your debugging capabilities intact.
15+
16+
2. **Platform-Specific Builds:** Unlike the main Python extension, which bundles all debugpy builds for various platforms into a single extension package, the Python Debugger extension provides a more streamlined approach: it delivers platform-specific builds, ensuring you only receive the components relevant to your specific operating system. This reduces download times and unnecessary overhead.
17+
18+
3. **Feature Parity and Ongoing Updates:** This extension replicates all the functionality available in the main Python extension, and more. Going forward, any new debugger features will be added to this extension. In the future, the Python extension will no longer offer debugging support on its own, and we will transition all debugging support to this extension for all debugging functionality.
19+
20+
921
## Usage
1022

11-
Once installed in Visual Studio Code, debugpy will be automatically activated when you open a Python file.
23+
Once installed in Visual Studio Code, python-debugger will be automatically activated when you open a Python file.
1224

13-
## Disabling the Debugpy extension
14-
If you want to disable the Debugpy extension, you can [disable this extension](https://code.visualstudio.com/docs/editor/extension-marketplace#_disable-an-extension) per workspace in Visual Studio Code.
25+
## Disabling the Python Debugger extension
26+
If you want to disable the Python Debugger extension, you can [disable this extension](https://code.visualstudio.com/docs/editor/extension-marketplace#_disable-an-extension) per workspace in Visual Studio Code.
1527

1628
## Commands
1729

1830
| Command | Description |
1931
| ---------------------- | --------------------------------- |
20-
| Debugpy: viewOutput | Show the debugpy extension output. |
21-
| Debugpy: clearCacheAndReload | Allows you to clear the global values set in the extension. |
22-
| Debugpy: debugInTerminal | Allows you to debug a simple Python file in the terminal. |
32+
| Python Debugger: viewOutput | Show the Python Debugger Extension output. |
33+
| Python Debugger: clearCacheAndReload | Allows you to clear the global values set in the extension. |
34+
| Python Debugger: debugInTerminal | Allows you to debug a simple Python file in the terminal. |
2335

2436
## Data and telemetry
2537
The Debubpy Extension for Visual Studio Code collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](https://privacy.microsoft.com/privacystatement) to learn more. This extension respects the `telemetry.enableTelemetry` setting which you can learn more about at https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting.

build/azure-pipeline.pre-release.yml

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,36 @@ extends:
2828
template: azure-pipelines/extension/pre-release.yml@templates
2929
parameters:
3030
l10nSourcePaths: ./src
31+
buildPlatforms:
32+
- name: Linux
33+
packageArch: arm64
34+
vsceTarget: linux-arm64
35+
- name: Linux
36+
packageArch: arm
37+
vsceTarget: linux-armhf
38+
- name: Linux
39+
packageArch: x64
40+
vsceTarget: linux-x64
41+
- name: MacOS
42+
packageArch: arm64
43+
vsceTarget: darwin-arm64
44+
- name: MacOS
45+
packageArch: x64
46+
vsceTarget: darwin-x64
47+
- name: Windows
48+
packageArch: arm
49+
vsceTarget: win32-arm64
50+
- name: Windows
51+
packageArch: ia32
52+
vsceTarget: win32-ia32
53+
- name: Windows
54+
packageArch: x64
55+
vsceTarget: win32-x64
56+
3157
buildSteps:
3258
- task: NodeTool@0
3359
inputs:
34-
versionSpec: '16.17.1'
60+
versionSpec: '18.17.1'
3561
displayName: Select Node version
3662

3763
- task: UsePythonVersion@0
@@ -47,14 +73,14 @@ extends:
4773
- script: python -m pip install -U pip
4874
displayName: Upgrade pip
4975

50-
- script: python -m pip install wheel
51-
displayName: Install wheel
52-
53-
- script: python -m pip install nox
54-
displayName: Install wheel
76+
- script: python -m pip install wheel nox
77+
displayName: Install wheel and nox
5578

56-
- script: python -m nox --session install_old_bundled_libs
79+
# update according packageArch
80+
- script: python -m nox --session install_bundled_libs
5781
displayName: Install Python dependencies
82+
env:
83+
VSCETARGET: ${{ variables.VSCETARGET }}
5884

5985
- script: python ./build/update_ext_version.py --for-publishing
6086
displayName: Update build number

0 commit comments

Comments
 (0)