Merge branch 'main' of github.com:microsoft/vscode-python into use-py…

…thon-debugger-api
microsoft · Apr 16, 2024 · 5c23d90 · 5c23d90
2 parents fe82fea + fc49f2b
commit 5c23d90
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 77 deletions.
diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
@@ -29,7 +29,6 @@ runs:
         cache: 'pip'
         cache-dependency-path: |
           requirements.txt
-          build/build-install-requirements.txt
           python_files/jedilsp_requirements/requirements.txt
 
     - name: Upgrade Pip
@@ -38,26 +37,13 @@ runs:
 
     # For faster/better builds of sdists.
     - name: Install build pre-requisite
-      run: python -m pip install wheel
+      run: python -m pip install wheel nox
       shell: bash
 
-    - name: Install Python dependencies
-      uses: brettcannon/pip-secure-install@v1
-      with:
-        options: '-t ./python_files/lib/python --implementation py'
-
-    - name: Get-pip
-      run: |
-        python -m pip --disable-pip-version-check install packaging
-        python ./python_files/download_get_pip.py
+    - name: Install Python Extension dependencies (jedi, debugpy, etc.)
+      run: nox --session install_python_libs
       shell: bash
 
-    - name: Install Jedi LSP
-      uses: brettcannon/pip-secure-install@v1
-      with:
-        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
       shell: bash

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -187,26 +187,15 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Download get-pip.py
-        run: |
-          python -m pip install wheel
-          python -m pip install -r build/build-install-requirements.txt
-          python ./python_files/download_get_pip.py
-        shell: bash
+      - name: Upgrade Pip
+        run: python -m pip install -U pip
 
-      - 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 }}/python_files/lib/python" --no-cache-dir --implementation py'
-        if: startsWith(matrix.python, 3.)
+      # For faster/better builds of sdists.
+      - name: Install build pre-requisite
+        run: python -m pip install wheel nox
 
-      - name: Install Jedi requirements
-        uses: brettcannon/pip-secure-install@v1
-        with:
-          requirements-file: '"${{ env.special-working-directory-relative }}/python_files/jedilsp_requirements/requirements.txt"'
-          options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/jedilsp" --no-cache-dir --implementation py'
-        if: startsWith(matrix.python, 3.)
+      - name: Install Python Extension dependencies (jedi, debugpy, etc.)
+        run: nox --session install_python_libs
 
       - name: Install test requirements
         run: python -m pip install --upgrade -r build/test-requirements.txt

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -175,24 +175,15 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Download get-pip.py
-        run: |
-          python -m pip install wheel
-          python -m pip install -r build/build-install-requirements.txt
-          python ./python_files/download_get_pip.py
-        shell: bash
+      - name: Upgrade Pip
+        run: python -m pip install -U pip
 
-      - name: Install base 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 }}/python_files/lib/python" --no-cache-dir --implementation py'
+      # For faster/better builds of sdists.
+      - name: Install build pre-requisite
+        run: python -m pip install wheel nox
 
-      - name: Install Jedi requirements
-        uses: brettcannon/pip-secure-install@v1
-        with:
-          requirements-file: '"${{ env.special-working-directory-relative }}/python_files/jedilsp_requirements/requirements.txt"'
-          options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/jedilsp" --no-cache-dir --implementation py'
+      - name: Install Python Extension dependencies (jedi, debugpy, etc.)
+        run: nox --session install_python_libs
 
       - name: Install test requirements
         run: python -m pip install --upgrade -r build/test-requirements.txt

diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml
@@ -49,21 +49,12 @@ extends:
       - script: python -m pip install -U pip
         displayName: Upgrade pip
 
-      - script: python -m pip install wheel
-        displayName: Install wheel
+      - script: python -m pip install wheel nox
+        displayName: Install wheel and nox
 
       - script: |
-          python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
-          python ./python_files/download_get_pip.py
-        displayName: Get-pip.py
-
-      - script: |
-          python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt
-        displayName: Install Python dependencies
-
-      - script: |
-          python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/jedilsp --implementation py --platform any --abi none -r ./python_files/jedilsp_requirements/requirements.txt
-        displayName: Install Jedi Language Server
+          nox --session install_python_libs
+        displayName: Install debugpy, Jedi, get-pip, etc
 
       - script: |
           python ./build/update_ext_version.py --for-publishing

diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml
@@ -44,21 +44,12 @@ extends:
       - script: python -m pip install -U pip
         displayName: Upgrade pip
 
-      - script: python -m pip install wheel
-        displayName: Install wheel
+      - script: python -m pip install wheel nox
+        displayName: Install wheel and nox
 
       - script: |
-          python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
-          python ./python_files/download_get_pip.py
-        displayName: Get-pip.py
-
-      - script: |
-          python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt
-        displayName: Install Python dependencies
-
-      - script: |
-          python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/jedilsp --implementation py --platform any --abi none -r ./python_files/jedilsp_requirements/requirements.txt
-        displayName: Install Jedi Language Server
+          nox --session install_python_libs
+        displayName: Install debugpy, Jedi, get-pip, etc
 
       - script: |
           python ./build/update_ext_version.py --release --for-publishing