Merge debugpy into master. (microsoft#10290)

* Point to debugpy in the core extension (microsoft#10178)

* Rename gulp task to install new debugpy

* Fix install_ptvsd.py file and its references

* Update yaml files

* Make sure the paths in factory.ts point to debugpy when using DebugAdapterExectable

* Fix tests

* Correct install debugger wheels

* Rename ptvsd methods to generic debugger name

* Updated child process hook to support 'debugpy_attach' request

* News entry

* Format gulpfile.js

* Use generic debugger name

* Update method getRemoteDebuggerArgs() and add tests

* Rename new_debugpy to debugpy

* Oops

* DataScience: Update debugger to point to debugpy (microsoft#10214)

* Update datascience bits to debugpy.

* Cleanup

* Adds a prompt that shows up when user attaches to `ptvsd` (microsoft#10338)

* Add prompt when using ptvsd to attach
* Update prompt message.
* Update tests.

* Fix text and grammar

Co-authored-by: Kartik Raj <karraj@microsoft.com>

Author: karthiknadig

.github/workflows/ci.yml

@@ -40,30 +40,30 @@ jobs:
         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'
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre ptvsd
+          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/debugpy/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
 
-      - name: Install ptvsd wheels
+      - name: Install debugpy wheels
         run: |
           python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
-          python ./pythonFiles/install_ptvsd.py
+          python ./pythonFiles/install_debugpy.py
 
-      # Retrieve the list of ptvsd versions from PyPI in order to increase the specificity of the pip cache key,
+      # Retrieve the list of debugpy versions from PyPI in order to increase the specificity of the pip cache key,
       # so that the cache gets invalidated as necessary.
       # See https://github.com/microsoft/vscode-python/pull/9843#discussion_r373635221
-      - name: curl PyPI to get ptvsd versions
-        run: curl --output ptvsd.json https://pypi.org/pypi/ptvsd/json
+      - name: curl PyPI to get debugpy versions
+        run: curl --output debugpy.json https://pypi.org/pypi/debugpy/json
 
       - name: Cache pip files
         uses: actions/cache@v1
         with:
           path: ~/.cache/pip
-          key: ${{runner.os}}-${{env.CACHE_PIP_DEPS}}-pip-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}}
+          key: ${{runner.os}}-${{env.CACHE_PIP_DEPS}}-pip-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}}
 
       - name: Cache ./pythonFiles/lib/python
         uses: actions/cache@v1
         with:
           path: ./pythonFiles/lib/python
-          key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}}
+          key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}}
 
   js-ts-deps:
     name: Install npm dependencies
@@ -148,14 +148,14 @@ jobs:
           path: ~/.npm
           key: ${{runner.os}}-${{env.CACHE_NPM_DEPS}}-${{hashFiles('package-lock.json')}}
 
-      - name: curl PyPI to get ptvsd versions
-        run: curl --output ptvsd.json https://pypi.org/pypi/ptvsd/json
+      - name: curl PyPI to get debugpy versions
+        run: curl --output debugpy.json https://pypi.org/pypi/debugpy/json
 
       - name: Retrieve cached pythonFiles/ directory
         uses: actions/cache@v1
         with:
           path: ./pythonFiles/lib/python
-          key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}}
+          key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}}
 
       - name: Install dependencies (npm ci)
         run: npm ci --prefer-offline
@@ -222,28 +222,28 @@ jobs:
         with:
           python-version: ${{matrix.python}}
 
-      - name: curl PyPI to get ptvsd versions
-        run: curl --output ptvsd.json https://pypi.org/pypi/ptvsd/json
+      - name: curl PyPI to get debugpy versions
+        run: curl --output debugpy.json https://pypi.org/pypi/debugpy/json
 
       - name: Retrieve cached pythonFiles/ directory
         uses: actions/cache@v1
         # Use an id for this step so that its cache-hit output can be accessed and checked in the next step.
         id: pythonFiles-cache
         with:
           path: ./pythonFiles/lib/python
-          key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}}
+          key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}}
 
       - name: Install Python requirements if not cached
         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'
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre ptvsd
+          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/debugpy/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
         if: steps.pythonFiles-cache.outputs.cache-hit == false
 
-      - name: Install ptvsd wheels if not cached
+      - name: Install debugpy wheels if not cached
         run: |
           python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
-          python ./pythonFiles/install_ptvsd.py
+          python ./pythonFiles/install_debugpy.py
         if: steps.pythonFiles-cache.outputs.cache-hit == false
 
       - name: Install test requirements

build/ci/templates/steps/build.yml

@@ -12,50 +12,50 @@
 #   If `true`, means we need to build the VSIX, else just compile.
 
 steps:
-    - template: initialization.yml
-      parameters:
-          PythonVersion: $(PythonVersion)
-          workingDirectory: $(Build.SourcesDirectory)
-          compile: 'false'
-
-    - 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'
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre ptvsd
-      failOnStderr: true
-      displayName: 'pip install requirements'
-
-    - bash: |
-          python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
-          python ./pythonFiles/install_ptvsd.py
-      failOnStderr: true
-      displayName: 'Install PTVSD wheels'
-
-    - bash: npm run clean
-      displayName: 'Clean'
-
-    - bash: |
-          npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID
-      displayName: 'Update dev Version of Extension'
-      condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
-
-    - bash: |
-          npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID --updateChangelog
-      displayName: 'Update release Version of Extension'
-      condition: and(succeeded(), startsWith(variables['Build.SourceBranchName'], 'release'))
-
-    - bash: |
-          npm run package
-      displayName: 'Build VSIX'
-
-    - task: CopyFiles@2
-      inputs:
-          contents: '*.vsix'
-          targetFolder: $(Build.ArtifactStagingDirectory)
-      displayName: 'Copy VSIX'
-
-    - task: PublishBuildArtifacts@1
-      inputs:
-          pathtoPublish: $(Build.ArtifactStagingDirectory)
-          artifactName: VSIX
-      displayName: 'Publish VSIX to Artifacts'
+  - template: initialization.yml
+    parameters:
+      PythonVersion: $(PythonVersion)
+      workingDirectory: $(Build.SourcesDirectory)
+      compile: 'false'
+
+  - 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'
+      python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/debugpy/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
+    failOnStderr: true
+    displayName: 'pip install requirements'
+
+  - bash: |
+      python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
+      python ./pythonFiles/install_debugpy.py
+    failOnStderr: true
+    displayName: 'Install DEBUGPY wheels'
+
+  - bash: npm run clean
+    displayName: 'Clean'
+
+  - bash: |
+      npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID
+    displayName: 'Update dev Version of Extension'
+    condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
+
+  - bash: |
+      npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID --updateChangelog
+    displayName: 'Update release Version of Extension'
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranchName'], 'release'))
+
+  - bash: |
+      npm run package
+    displayName: 'Build VSIX'
+
+  - task: CopyFiles@2
+    inputs:
+      contents: '*.vsix'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+    displayName: 'Copy VSIX'
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: VSIX
+    displayName: 'Publish VSIX to Artifacts'