Skip to content

Commit c1c5552

Browse files
authored
Cherry pick fixes and update change logs (#9498)
* Update debugger to 5.0.0a11 (#9495) * Update change log
1 parent 0584e5d commit c1c5552

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Enhancements
66

7+
1. Add support for `Find` in the `Notebook Editor`.
8+
([#9470](https://github.com/Microsoft/vscode-python/issues/9470))
79

810
### Fixes
911

@@ -15,6 +17,8 @@
1517
([#9439](https://github.com/Microsoft/vscode-python/issues/9439))
1618
1. Scrape output to get the details of the registered kernel.
1719
([#9444](https://github.com/Microsoft/vscode-python/issues/9444))
20+
1. Update `ptvsd` debugger to version v5.0.0a11. Fixes signing for `inject_dll_x86.exe`.
21+
([#9474](https://github.com/Microsoft/vscode-python/issues/9474))
1822

1923
### Code Health
2024

@@ -62,8 +66,6 @@
6266
([#4644](https://github.com/Microsoft/vscode-python/issues/4644))
6367
1. Notify user when starting jupyter times out and added `Jupyter` output panel to display output from Jupyter.
6468
([#9068](https://github.com/Microsoft/vscode-python/issues/9068))
65-
1. Add support for `Find` in the `Notebook Editor`.
66-
([#9470](https://github.com/Microsoft/vscode-python/issues/9470))
6769

6870
### Fixes
6971

build/ci/templates/steps/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
python -m pip install -U pip
2323
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
2424
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/old_ptvsd --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==4.3.2'
25-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==5.0.0a9'
25+
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==5.0.0a11'
2626
failOnStderr: true
2727
displayName: "pip install requirements"
2828

build/ci/templates/test_phases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ steps:
9797
python -m pip install --upgrade -r build/test-requirements.txt
9898
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
9999
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/old_ptvsd --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==4.3.2'
100-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==5.0.0a9'
100+
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==5.0.0a11'
101101
displayName: 'pip install system test requirements'
102102
condition: and(succeeded(), eq(variables['NeedsPythonTestReqs'], 'true'))
103103

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ gulp.task('installNewPtvsd', async () => {
283283
}
284284

285285
// Install source only version of new PTVSD for use with all other python versions.
286-
const args = ['-m', 'pip', '--disable-pip-version-check', 'install', '-t', './pythonFiles/lib/python/new_ptvsd/no_wheels', '--no-cache-dir', '--implementation', 'py', '--no-deps', '--upgrade', 'ptvsd==5.0.0a9']
286+
const args = ['-m', 'pip', '--disable-pip-version-check', 'install', '-t', './pythonFiles/lib/python/new_ptvsd/no_wheels', '--no-cache-dir', '--implementation', 'py', '--no-deps', '--upgrade', 'ptvsd==5.0.0a11']
287287
const successWithoutWheels = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args)
288288
.then(() => true)
289289
.catch(ex => {

news/1 Enhancements/9470.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

pythonFiles/install_ptvsd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
EXTENSION_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
99
DEBUGGER_DEST = os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python", "new_ptvsd", "wheels")
1010
DEBUGGER_PACKAGE = "ptvsd"
11-
DEBUGGER_VERSION = "5.0.0a9"
11+
DEBUGGER_VERSION = "5.0.0a11"
1212
DEBUGGER_PYTHON_VERSIONS = ("cp37",)
1313

1414

0 commit comments

Comments
 (0)