Remove ptvsd install (microsoft#11998)

* Remove ptvsd install and update to debugpy * Remove ptvsd install and switch to debugpy

Author: karthiknadig

.github/release_plan.md

@@ -5,20 +5,20 @@
 
 # Release candidate (Monday, XXX XX)
 
-- [ ] Announce the code freeze (not just to team but also to ptvsd and language server)
+- [ ] Announce the code freeze (not just to team but also to debugger and language server)
 - [ ] Update master for the release
  - [ ] Create a branch against `master` for a pull request
  - [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) from a `-dev` suffix to `-rc` (🤖)
  - [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date (🤖)
- - [ ] Update `requirements.txt` to point to latest release version of [ptvsd](https://github.com/microsoft/ptvsd).
+ - [ ] Extension will pick up latest version of `debugpy`. If you need to pin to a particular version see `install_debugpy.py`.
  - [ ] Update `languageServerVersion` in `package.json` to point to the latest version of the [Language Server](https://github.com/Microsoft/python-language-server).
  - [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/master/CHANGELOG.md) (🤖)
  - [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/master/news) (typically `python news --final --update CHANGELOG.md | code-insiders -`)
  - [ ] Copy over the "Thanks" section from the previous release
  - [ ] Make sure the "Thanks" section is up-to-date (e.g. compare to versions in requirements.json)
  - [ ] Touch up news entries (e.g. add missing periods)
  - [ ] Check the Markdown rendering to make sure everything looks good
- - [ ] Add any relevant news entries for ptvsd and the language server if they were updated
+ - [ ] Add any relevant news entries for `debugpy` and the language server if they were updated
  - [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (see team notes)
  - [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Repository.txt) as appropriate
  - [ ] Create a pull request against `master` (🤖)

.github/test_plan.md

@@ -320,7 +320,7 @@ class FailingTests(unittest.TestCase):
  - [ ] `Debug Test` works
  - [ ] Module/suite setup methods are also run (run the `test_setup` method to verify)
 - [ ] while debugging tests, an uncaught exception in a test does not
- cause ptvsd to raise SystemExit
+ cause `debugpy` to raise `SystemExit` exception.
 
 #### [`pytest`](https://code.visualstudio.com/docs/python/unit-testing#_pytest-configuration-settings)
 

.github/workflows/ci.yml

@@ -45,9 +45,8 @@ jobs:
  - name: Install Python requirements
  run: |
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
- 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'
 
- - name: Install debugpy wheels
+ - name: Install debugpy with wheels
  run: |
  python -m pip install wheel
  python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
@@ -208,6 +207,7 @@ jobs:
  # Something in Node 12.16.0 breaks the TS debug adapter, and ubuntu-latest bundles Node 12.16.1.
  # We can remove this when we switch over to the python-based DA in https://github.com/microsoft/vscode-python/issues/7136.
  # See https://github.com/microsoft/ptvsd/issues/2068
+ # At this point pinning is only needed for consistency. We no longer have TS debug adapter.
  NODE_VERSION: 12.15.0
  steps:
  - name: Checkout
@@ -257,7 +257,6 @@ jobs:
  - name: Install Python requirements
  run: |
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
- 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'
  # 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.
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
 
@@ -457,7 +456,6 @@ jobs:
  run: |
  python -m pip install --upgrade -r build/test-requirements.txt
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
- 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'
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
  shell: bash
 

.gitignore

@@ -22,7 +22,6 @@ cucumber-report.json
 **/.venv*/
 port.txt
 precommit.hook
-pythonFiles/experimental/ptvsd/**
 pythonFiles/lib/**
 debug_coverage*/**
 languageServer/**
@@ -38,7 +37,7 @@ xunit-test-results.xml
 build/ci/performance/performance-results.json
 !build/
 debug*.log
-ptvsd*.log
+debugpy*.log
 pydevd*.log
 nodeLanguageServer/**
 nodeLanguageServer.*/**

CONTRIBUTING.md

@@ -335,7 +335,6 @@ Steps to build the extension on your machine once you've cloned the repo:
 # Perform the next steps in the vscode-python folder.
 > npm ci
 > python3 -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
-> python3 -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'
 # For python 3.6 and lower use this command to install the debugger
 > python3 -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
 # For python 3.7 and greater use this command to install the debugger

build/ci/templates/steps/build.yml

@@ -20,7 +20,6 @@ steps:
 
  - bash: |
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
- 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'
  failOnStderr: true
  displayName: 'pip install requirements'
 

build/ci/templates/test_phases.yml

@@ -89,7 +89,7 @@ steps:
  - template: steps/generate_upload_coverage.yml
 
  # Install the requirements for the Python or the system tests. This includes the supporting libs that
- # we ship in our extension such as PTVSD, DEBUGPY and Jedi.
+ # we ship in our extension such as DEBUGPY and Jedi.
  #
  # This task will only run if variable `NeedsPythonTestReqs` is true.
  #
@@ -100,7 +100,6 @@ steps:
  - bash: |
  python -m pip install --upgrade -r build/test-requirements.txt
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
- 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'
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
  displayName: 'pip install system test requirements'
  condition: and(succeeded(), eq(variables['NeedsPythonTestReqs'], 'true'))

gulpfile.js

@@ -346,7 +346,7 @@ gulp.task('installPythonRequirements', async () => {
 });
 
 // See https://github.com/microsoft/vscode-python/issues/7136
-gulp.task('installNewDebugpy', async () => {
+gulp.task('installDebugpy', async () => {
  // Install dependencies needed for 'install_debugpy.py'
  const depsArgs = [
  '-m',
@@ -392,37 +392,7 @@ gulp.task('installNewDebugpy', async () => {
  rmrf.sync('./pythonFiles/lib/temp');
 });
 
-// Install the last stable version of old PTVSD (which includes a middle layer adapter and requires ptvsd_launcher.py)
-// until all users have migrated to the new debug adapter + new DEBUGPY (specified in requirements.txt)
-// See https://github.com/microsoft/vscode-python/issues/7136
-gulp.task('installOldPtvsd', async () => {
- const args = [
- '-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'
- ];
- const success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
- .then(() => true)
- .catch((ex) => {
- console.error("Failed to install PTVSD using 'python3'", ex);
- return false;
- });
- if (!success) {
- console.info("Failed to install PTVSD using 'python3', attempting to install using 'python'");
- await spawnAsync('python', args).catch((ex) => console.error("Failed to install PTVSD using 'python'", ex));
- }
-});
-
-gulp.task('installPythonLibs', gulp.series('installPythonRequirements', 'installOldPtvsd', 'installNewDebugpy'));
+gulp.task('installPythonLibs', gulp.series('installPythonRequirements', 'installDebugpy'));
 
 function uploadExtension(uploadBlobName) {
  const azure = require('gulp-azure-storage');

package.nls.json

@@ -492,7 +492,7 @@
  "DataScience.createdNewNotebook": "{0}: Creating new notebook ",
  "DataScience.createdNewKernel": "{0}: Kernel started: {1}",
  "DataScience.kernelInvalid": "Kernel {0} is not usable. Check the Jupyter output tab for more information.",
- "OutdatedDebugger.updateDebuggerMessage": "We noticed you are attaching to ptvsd (Python debugger), which will be deprecated on May 1st, 2020. Please switch to [debugpy](https://aka.ms/migrateToDebugpy).",
+ "OutdatedDebugger.updateDebuggerMessage": "We noticed you are attaching to ptvsd (Python debugger), which was deprecated on May 1st, 2020. Please switch to [debugpy](https://aka.ms/migrateToDebugpy).",
  "DataScience.nativeDependencyFail": "We cannot launch a jupyter server because your OS is not supported. Select an already running server if you wish to continue. {0}",
  "DataScience.selectNewServer": "Pick Running Server",
  "DataScience.jupyterSelectURIRemoteLabel": "Existing",

src/client/api.ts

@@ -26,7 +26,7 @@ export interface IExtensionApi {
  /**
  * Generate an array of strings for commands to pass to the Python executable to launch the debugger for remote debugging.
  * Users can append another array of strings of what they want to execute along with relevant arguments to Python.
- * E.g `['/Users/..../pythonVSCode/pythonFiles/ptvsd_launcher.py', '--host', 'localhost', '--port', '57039', '--wait']`
+ * E.g `['/Users/..../pythonVSCode/pythonFiles/lib/python/debugpy', '--listen', 'localhost:57039', '--wait-for-client']`
  * @param {string} host
  * @param {number} port
  * @param {boolean} [waitUntilDebuggerAttaches=true]