Apply positron-python updates from vscode-python v2024.4.0

.github/workflows/positron-python-ci.yml

@@ -23,7 +23,7 @@ env:
   NODE_VERSION: '18.17.1'
   PYTHON_VERSION: '3.10'
   PROJECT_DIR: 'extensions/positron-python'
-  PYTHON_SRC_DIR: 'extensions/positron-python/pythonFiles'
+  PYTHON_SRC_DIR: 'extensions/positron-python/python_files'
   # Force a path with spaces and to test extension works in these scenarios
   # Unicode characters are causing 2.7 failures so skip that for now.
   special-working-directory: './path with spaces'
@@ -67,16 +67,11 @@ jobs:
       - name: Check TypeScript format
         run: yarn format-check
 
-      - name: Check Python format
-        run: |
-          python -m pip install -U black
-          python -m black . --check
-        working-directory: ${{ env.PYTHON_SRC_DIR }}
-
-      - name: Run Ruff
+      - name: Lint and Check Formatting with Ruff
         run: |
           python -m pip install -U ruff
           python -m ruff check .
+          python -m ruff format --check
         working-directory: ${{ env.PYTHON_SRC_DIR }}
 
   check-types:
@@ -93,16 +88,16 @@ jobs:
           cache: 'pip'
 
       - name: Install base Python requirements
-        run: 'python -m pip install --no-deps --require-hashes --only-binary :all: -t ./pythonFiles/lib/python --no-cache-dir --implementation py -r requirements.txt'
+        run: 'python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --no-cache-dir --implementation py -r requirements.txt'
 
       - name: Install Positron IPyKernel requirements
         run: python scripts/vendor.py
 
       - name: Install other Python requirements
         run: |
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
+          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
-          python -m pip install --upgrade -r ./pythonFiles/positron/pinned-test-requirements.txt
+          python -m pip install --upgrade -r ./python_files/positron/pinned-test-requirements.txt
 
       - name: Run Pyright
         uses: jakebailey/pyright-action@v2
@@ -169,13 +164,13 @@ jobs:
         run: python -m pytest --version
 
       - name: Install base Python requirements
-        run: 'python -m pip install --no-deps --require-hashes --only-binary :all: -t ./pythonFiles/lib/python --no-cache-dir --implementation py -r requirements.txt'
+        run: 'python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --no-cache-dir --implementation py -r requirements.txt'
 
       - name: Install test requirements
         run: python -m pip install -r build/test-requirements.txt
 
       - name: Run Python unit tests
-        run: python pythonFiles/tests/run_all.py
+        run: python python_files/tests/run_all.py
 
   positron-ipykernel-tests:
     name: Test Positron IPyKernel
@@ -225,7 +220,7 @@ jobs:
         run: python scripts/vendor.py
 
       - name: Install Positron IPyKernel test requirements
-        run: python -m pip install --prefer-binary --upgrade -r pythonFiles/positron/pinned-test-requirements.txt
+        run: python -m pip install --prefer-binary --upgrade -r python_files/positron/pinned-test-requirements.txt
 
       - name: Get date for older dependencies
         if: ${{ matrix.time-elapsed != '' }}
@@ -237,10 +232,10 @@ jobs:
         run: |
           python -m pip config set global.index-url https://packagemanager.posit.co/pypi/${{ env.SNAPSHOT_DATE }}/simple
           python -m pip config set global.trusted-host packagemanager.posit.co
-          python -m pip install --prefer-binary --force-reinstall -r pythonFiles/positron/data-science-requirements.txt
+          python -m pip install --prefer-binary --force-reinstall -r python_files/positron/data-science-requirements.txt
 
       - name: Run Positron IPyKernel unit tests
-        run: pytest pythonFiles/positron
+        run: pytest python_files/positron
 
   typescript-tests:
     name: Test TypeScript

extensions/positron-python/.devcontainer/devcontainer.json

@@ -9,13 +9,13 @@
     "customizations": {
         "vscode": {
             "extensions": [
+                "charliermarsh.ruff",
                 "editorconfig.editorconfig",
                 "esbenp.prettier-vscode",
                 "dbaeumer.vscode-eslint",
                 "ms-python.python",
-                "ms-python.black-formatter",
                 "ms-python.vscode-pylance",
-                "charliermarsh.ruff"
+                "ms-python.debugpy"
             ]
         }
     },

extensions/positron-python/.eslintignore

@@ -105,7 +105,7 @@ src/test/common/process/proc.unit.test.ts
 src/test/common/interpreterPathService.unit.test.ts
 
 
-src/test/pythonFiles/formatting/dummy.ts
+src/test/python_files/formatting/dummy.ts
 
 src/test/debugger/extension/adapter/adapter.test.ts
 src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts

extensions/positron-python/.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+# Prettier
+2b6a8f2d439fe9d5e66665ea46d8b690ac9b2c39
+649156a09ccdc51c0d20f7cd44540f1918f9347b
+4f774d94bf4fbf87bb417b2b2b8e79e334eb3536
+61b179b2092050709e3c373a6738abad8ce581c4
+c33617b0b98daeb4d72040b48c5850b476d6256c
+db8e1e2460e9754ec0672d958789382b6d15c5aa
+08bc9ad3bee5b19f02fa756fbc53ab32f1b39920
+# Black
+a58eeffd1b64498e2afe5f11597888dfd1c8699c
+5cd8f539f4d2086b718c8f11f823c0ac12fc2c49
+9ec9e9eaebb25adc6d942ac19d4d6c128abb987f
+c4af91e090057d20d7a633b3afa45eaa13ece76f
+# Ruff
+e931bed3efbede7b05113316506958ecd7506777

extensions/positron-python/.github/actions/build-vsix/action.yml

@@ -30,7 +30,7 @@ runs:
         cache-dependency-path: |
           requirements.txt
           build/build-install-requirements.txt
-          pythonFiles/jedilsp_requirements/requirements.txt
+          python_files/jedilsp_requirements/requirements.txt
 
     - name: Upgrade Pip
       run: python -m pip install -U pip
@@ -44,20 +44,20 @@ runs:
     - name: Install Python dependencies
       uses: brettcannon/pip-secure-install@v1
       with:
-        options: '-t ./pythonFiles/lib/python --implementation py'
+        options: '-t ./python_files/lib/python --implementation py'
 
     - name: Install debugpy and get-pip
       run: |
         python -m pip --disable-pip-version-check install packaging
-        python ./pythonFiles/install_debugpy.py
-        python ./pythonFiles/download_get_pip.py
+        python ./python_files/install_debugpy.py
+        python ./python_files/download_get_pip.py
       shell: bash
 
     - name: Install Jedi LSP
       uses: brettcannon/pip-secure-install@v1
       with:
-        requirements-file: './pythonFiles/jedilsp_requirements/requirements.txt'
-        options: '-t ./pythonFiles/lib/jedilsp --implementation py --platform any --abi none'
+        requirements-file: './python_files/jedilsp_requirements/requirements.txt'
+        options: '-t ./python_files/lib/jedilsp --implementation py --platform any --abi none'
 
     - name: Run npm ci
       run: npm ci --prefer-offline

extensions/positron-python/.github/actions/lint/action.yml

@@ -41,16 +41,10 @@ runs:
         python-version: '3.x'
         cache: 'pip'
 
-    - name: Check Python format
-      run: |
-        python -m pip install -U black
-        python -m black . --check
-      working-directory: pythonFiles
-      shell: bash
-
     - name: Run Ruff
       run: |
         python -m pip install -U ruff
         python -m ruff check .
-      working-directory: pythonFiles
+        python -m ruff format --check
+      working-directory: python_files
       shell: bash

extensions/positron-python/.github/actions/smoke-tests/action.yml

@@ -34,12 +34,12 @@ runs:
     - name: Install Python requirements
       uses: brettcannon/pip-secure-install@v1
       with:
-        options: '-t ./pythonFiles/lib/python --implementation py'
+        options: '-t ./python_files/lib/python --implementation py'
 
     - 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 ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy
+        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.

extensions/positron-python/.github/release_plan.md

@@ -1,14 +1,34 @@
+### General Notes
 All dates should align with VS Code's [iteration](https://github.com/microsoft/vscode/labels/iteration-plan) and [endgame](https://github.com/microsoft/vscode/labels/endgame-plan) plans.
 
 Feature freeze is Monday @ 17:00 America/Vancouver, XXX XX. At that point, commits to `main` should only be in response to bugs found during endgame testing until the release candidate is ready.
 
+<details>
+  <summary>Release Primary and Secondary Assignments for the 2024 Calendar Year</summary>
 
-NOTE: the number of this release is in the issue title and can be substituted in wherever you see [YYYY.minor].
+|   Month   | Primary   | Secondary   |
+|:----------|:----------|:------------|
+✅ | ~~January~~   | ~~Eleanor~~   | ~~Karthik~~     |
+✅ | February  | Kartik    | Anthony     |
+| March     | Karthik   | Eleanor     |
+| April     | Paula     | Kartik      |
+| May       | Anthony   | Karthik     |
+| June      | Eleanor   | Paula       |
+| July      | Anthony   | Karthik     |
+| August    | Paula     | Kartik      |
+| September | Anthony   | Eleanor     |
+| October   | Paula     | Kartik     |
+| November  | Kartik    | Eleanor     |
+| December  | Karthik   | Anthony     |
+
+</details>
 
 
 # Release candidate (Monday, XXX XX)
 
 NOTE: Third Party Notices are automatically added by our build pipelines using  https://tools.opensource.microsoft.com/notice.
+NOTE: the number of this release is in the issue title and can be substituted in wherever you see [YYYY.minor].
+
 
 ### Step 1:
 ##### Bump the version of `main` to be a release candidate (also updating debugpy dependences, third party notices, and package-lock.json).❄️ (steps with ❄️ will dictate this step happens while main is frozen 🥶)
@@ -17,7 +37,7 @@ NOTE: Third Party Notices are automatically added by our build pipelines using
 -   [ ] Create a new branch called  **`bump-release-[YYYY.minor]`**.
 -   [ ] Change the version in `package.json` to the next **even** number and switch the `-dev` to `-rc`. (🤖)
 -   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(you should now see changes to the `package.json` and `package-lock.json` at this point which update the version number **only**)_. (🤖)
--   [ ] Check [debugpy on PyPI](https://pypi.org/project/debugpy/) for a new release and update the version of debugpy in [`install_debugpy.py`](https://github.com/microsoft/vscode-python/blob/main/pythonFiles/install_debugpy.py) if necessary.
+-   [ ] Check [debugpy on PyPI](https://pypi.org/project/debugpy/) for a new release and update the version of debugpy in [`install_debugpy.py`](https://github.com/microsoft/vscode-python/blob/main/python_files/install_debugpy.py) if necessary.
 -   [ ] Update `ThirdPartyNotices-Repository.txt` as appropriate. You can check by looking at the [commit history](https://github.com/microsoft/vscode-python/commits/main) and scrolling through to see if there's anything listed there which might have pulled in some code directly into the repository from somewhere else. If you are still unsure you can check with the team.
 -   [ ] Create a PR from your branch  **`bump-release-[YYYY.minor]`** to `main`. Add the `"no change-log"` tag to the PR so it does not show up on the release notes before merging it.
 

extensions/positron-python/.github/workflows/build.yml

@@ -87,21 +87,21 @@ jobs:
       - name: Install core Python requirements
         uses: brettcannon/pip-secure-install@v1
         with:
-          options: '-t ./pythonFiles/lib/python --no-cache-dir --implementation py'
+          options: '-t ./python_files/lib/python --no-cache-dir --implementation py'
 
       - name: Install Jedi requirements
         run: python scripts/vendor.py
 
       - name: Install other Python requirements
         run: |
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
+          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
         uses: jakebailey/pyright-action@v2
         with:
           version: 1.1.308
-          working-directory: 'pythonFiles'
+          working-directory: 'python_files'
 
   python-tests:
     name: Python Tests
@@ -134,13 +134,13 @@ jobs:
         uses: brettcannon/pip-secure-install@v1
         with:
           requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
-          options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
+          options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
 
       - name: Install test requirements
         run: python -m pip install --upgrade -r build/test-requirements.txt
 
       - name: Run Python unit tests
-        run: python pythonFiles/tests/run_all.py
+        run: python python_files/tests/run_all.py
 
   tests:
     name: Tests
@@ -189,19 +189,19 @@ jobs:
         run: |
           python -m pip install wheel
           python -m pip install -r build/build-install-requirements.txt
-          python ./pythonFiles/download_get_pip.py
+          python ./python_files/download_get_pip.py
         shell: bash
 
       - 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 ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
+          python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
 
       - name: Install core Python requirements
         uses: brettcannon/pip-secure-install@v1
         with:
           requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
-          options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
+          options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
         if: startsWith(matrix.python, 3.)
 
       - name: Install Jedi requirements
@@ -215,7 +215,7 @@ jobs:
         run: |
           python -m pip install wheel
           python -m pip install -r build/build-install-requirements.txt
-          python ./pythonFiles/install_debugpy.py
+          python ./python_files/install_debugpy.py
         shell: bash
         if: matrix.test-suite == 'debugger'