Merge branch 'main' into RunWithREPL

microsoft · May 10, 2024 · ed65b3a · ed65b3a
2 parents b8e8fb0 + d99e74e
commit ed65b3a
Show file tree

Hide file tree

Showing 99 changed files with 3,603 additions and 2,908 deletions.
diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json
@@ -0,0 +1,12 @@
+{
+    "tool": "Credential Scanner",
+    "suppressions": [
+      {
+        "file": [
+          "file:///mnt/vss/_work/1/a/extension/extension/.nox/install_python_libs/lib/python3.8/site-packages/setuptools/_distutils/command%5Cregister.py",
+          "file:///mnt/vss/_work/1/b/extension/extension/.nox/install_python_libs/lib/python3.8/site-packages/setuptools/_distutils/command%5Cregister.py"
+        ],
+        "_justification": "These are not real passwords. For documentation purposes only."
+      }
+    ]
+  }
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -9,9 +9,9 @@ contact_links:
   - name: 'Jupyter'
     url: https://github.com/microsoft/vscode-jupyter/issues
     about: 'For issues relating to the Jupyter extension (including the interactive window)'
-  - name: 'Debugpy'
-    url: https://github.com/microsoft/debugpy/issues
-    about: 'For issues relating to the debugpy debugger'
+  - name: 'Python Debugger'
+    url: https://github.com/microsoft/vscode-python-debugger/issues
+    about: 'For issues relating to the Python debugger'
   - name: Help/Support
     url: https://github.com/microsoft/vscode-python/discussions/categories/q-a
     about: 'Having trouble with the extension? Need help getting something to work?'
diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
@@ -40,7 +40,7 @@ runs:
       run: python -m pip install wheel nox
       shell: bash
 
-    - name: Install Python Extension dependencies (jedi, debugpy, etc.)
+    - name: Install Python Extension dependencies (jedi, etc.)
       run: nox --session install_python_libs
       shell: bash
 

diff --git a/.github/actions/smoke-tests/action.yml b/.github/actions/smoke-tests/action.yml
@@ -39,7 +39,6 @@ runs:
     - name: pip install system test requirements
       run: |
         python -m pip install --upgrade -r build/test-requirements.txt
-        python -m pip --disable-pip-version-check install -t ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
       shell: bash
 
     # Bits from the VSIX are reused by smokeTest.ts to speed things up.

diff --git a/.github/release_plan.md b/.github/release_plan.md
@@ -9,18 +9,23 @@ Feature freeze is Monday @ 17:00 America/Vancouver, XXX XX. At that point, commi
 |   Month   | Primary   | Secondary   |
 |:----------|:----------|:------------|
 ✅ | ~~January~~   | ~~Eleanor~~   | ~~Karthik~~     |
-✅ | February  | Kartik    | Anthony     |
-| March     | Karthik   | Eleanor     |
-| April     | Paula     | Kartik      |
+✅ | ~~February~~  | ~~Kartik~~    | ~~Anthony~~     |
+✅| ~~March~~     | ~~Karthik~~   | ~~Eleanor~~     |
+| April     | Paula     | Eleanor      |
 | May       | Anthony   | Karthik     |
 | June      | Eleanor   | Paula       |
 | July      | Anthony   | Karthik     |
-| August    | Paula     | Kartik      |
+| August    | Paula     | Anthony      |
 | September | Anthony   | Eleanor     |
-| October   | Paula     | Kartik     |
-| November  | Kartik    | Eleanor     |
+| October   | Paula     | Karthik     |
+| November  | Eleanor    | Paula     |
 | December  | Karthik   | Anthony     |
 
+Paula: 3 primary, 2 secondary
+Eleanor: 3 primary (2 left), 3 secondary (2 left)
+Anthony: 2 primary, 3 secondary (2 left)
+Karthik: 2 primary (1 left), 4 secondary (3 left)
+
 </details>
 
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -97,7 +97,6 @@ jobs:
 
       - name: Install other Python requirements
         run: |
-          python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
           python -m pip install --upgrade -r build/test-requirements.txt
 
       - name: Run Pyright
@@ -195,7 +194,7 @@ jobs:
       - name: Install build pre-requisite
         run: python -m pip install wheel nox
 
-      - name: Install Python Extension dependencies (jedi, debugpy, etc.)
+      - name: Install Python Extension dependencies (jedi, etc.)
         run: nox --session install_python_libs
 
       - name: Install test requirements

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -71,7 +71,6 @@ jobs:
 
       - name: Install other Python requirements
         run: |
-          python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
           python -m pip install --upgrade -r build/test-requirements.txt
 
       - name: Run Pyright
@@ -183,7 +182,7 @@ jobs:
       - name: Install build pre-requisite
         run: python -m pip install wheel nox
 
-      - name: Install Python Extension dependencies (jedi, debugpy, etc.)
+      - name: Install Python Extension dependencies (jedi, etc.)
         run: nox --session install_python_libs
 
       - name: Install test requirements
@@ -386,11 +385,6 @@ jobs:
           requirements-file: './python_files/jedilsp_requirements/requirements.txt'
           options: '-t ./python_files/lib/jedilsp --implementation py'
 
-      - name: Install debugpy
-        run: |
-          # 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 ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
-
       - name: Install test requirements
         run: python -m pip install --upgrade -r build/test-requirements.txt
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,6 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-            "stopOnEntry": false,
             "smartStep": true,
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*", "!${workspaceFolder}/**/node_modules**/*"],
@@ -31,19 +30,11 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": ["--extensionDevelopmentPath=${workspaceFolder}", "${workspaceFolder}/data"],
-            "stopOnEntry": false,
             "smartStep": true,
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*", "!${workspaceFolder}/**/node_modules**/*"],
             "preLaunchTask": "Compile"
         },
-        {
-            "name": "Python: Current File",
-            "type": "python",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal"
-        },
         {
             "name": "Tests (Debugger, VS Code, *.test.ts)",
             "type": "extensionHost",
@@ -55,7 +46,6 @@
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
-            "stopOnEntry": false,
             "sourceMaps": true,
             "smartStep": true,
             "outFiles": ["${workspaceFolder}/out/**/*", "!${workspaceFolder}/**/node_modules**/*"],
@@ -83,7 +73,6 @@
                 "VSC_PYTHON_SMOKE_TEST": "1",
                 "TEST_FILES_SUFFIX": "smoke.test"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
             "preLaunchTask": "Compile",
@@ -103,7 +92,6 @@
             "env": {
                 "VSC_PYTHON_CI_TEST_GREP": "" // Modify this to run a subset of the single workspace tests
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
             "preLaunchTask": "Compile",
@@ -123,7 +111,6 @@
             "env": {
                 "VSC_PYTHON_CI_TEST_GREP": "Language Server:"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
             "preLaunchTask": "preTestJediLSP",
@@ -140,7 +127,6 @@
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
-            "stopOnEntry": false,
             "sourceMaps": true,
             "smartStep": true,
             "outFiles": ["${workspaceFolder}/out/**/*", "!${workspaceFolder}/**/node_modules**/*"],
@@ -236,19 +222,19 @@
             "program": "${file}",
             "request": "launch",
             "skipFiles": ["<node_internals>/**"],
-            "type": "pwa-node"
+            "type": "node"
         },
         {
             "name": "Python: Current File",
-            "type": "python",
+            "type": "debugpy",
             "justMyCode": true,
             "request": "launch",
             "program": "${file}",
             "console": "integratedTerminal",
             "cwd": "${workspaceFolder}"
         },
         {
-            "name": "Listen",
+            "name": "Python: Attach Listen",
             "type": "debugpy",
             "request": "attach",
             "listen": { "host": "localhost", "port": 5678 },
@@ -267,7 +253,7 @@
     "compounds": [
         {
             "name": "Debug Test Discovery",
-            "configurations": ["Listen", "Extension"]
+            "configurations": ["Python: Attach Listen", "Extension"]
         }
     ]
 }
diff --git a/.vscodeignore b/.vscodeignore
@@ -25,6 +25,7 @@ vscode-python-signing.*
 .github/**
 .mocha-reporter/**
 .nvm/**
+.nox/**
 .nyc_output
 .prettierrc.js
 .sonarcloud.properties

diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml
@@ -54,7 +54,7 @@ extends:
 
       - script: |
           nox --session install_python_libs
-        displayName: Install debugpy, Jedi, get-pip, etc
+        displayName: Install Jedi, get-pip, etc
 
       - script: |
           python ./build/update_ext_version.py --for-publishing
@@ -69,6 +69,9 @@ extends:
 
       - script: gulp prePublishBundle
         displayName: Build
+
+      - script: python -c "import shutil; shutil.rmtree('.nox', ignore_errors=True)"
+        displayName: Clean up Nox
     tsa:
         config:
             areaPath: 'Visual Studio Code Python Extensions'

diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml
@@ -49,7 +49,7 @@ extends:
 
       - script: |
           nox --session install_python_libs
-        displayName: Install debugpy, Jedi, get-pip, etc
+        displayName: Install Jedi, get-pip, etc
 
       - script: |
           python ./build/update_ext_version.py --release --for-publishing
@@ -64,6 +64,9 @@ extends:
 
       - script: gulp prePublishBundle
         displayName: Build
+
+      - script: python -c "import shutil; shutil.rmtree('.nox', ignore_errors=True)"
+        displayName: Clean up Nox
     tsa:
         config:
             areaPath: 'Visual Studio Code Python Extensions'

diff --git a/build/test-requirements.txt b/build/test-requirements.txt
@@ -12,10 +12,15 @@ flask
 fastapi
 uvicorn
 django
+testresources
+testscenarios
 
 # Integrated TensorBoard tests
 tensorboard
 torch-tb-profiler
 
 # extension build tests
 freezegun
+
+# testing custom pytest plugin require the use of named pipes
+namedpipe; platform_system == "Windows"
diff --git a/data/.vscode/settings.json b/data/.vscode/settings.json
diff --git a/data/test.py b/data/test.py
diff --git a/noxfile.py b/noxfile.py
@@ -32,13 +32,6 @@ def install_python_libs(session: nox.Session):
 
     session.install("packaging")
 
-    # Install debugger
-    session.run(
-        "python",
-        "./python_files/install_debugpy.py",
-        env={"PYTHONPATH": "./python_files/lib/temp"},
-    )
-
     # Download get-pip script
     session.run(
         "python",

diff --git a/package-lock.json b/package-lock.json