Merge branch 'vscode-python-issue-25609-scrollable-repl' of https://github.com/hutch3232/vscode-python into vscode-python-issue-25609-scrollable-repl

Author: hutch3232

.github/workflows/pr-file-check.yml

@@ -9,7 +9,8 @@ on:
       - 'labeled'
       - 'unlabeled'
 
-permissions: {}
+permissions:
+  pull-requests: read
 
 jobs:
   changed-files-in-pr:
@@ -19,6 +20,7 @@ jobs:
       - name: 'package-lock.json matches package.json'
         uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
         with:
+          token: ${{ github.token }}
           prereq-pattern: 'package.json'
           file-pattern: 'package-lock.json'
           skip-label: 'skip package*.json'
@@ -27,6 +29,7 @@ jobs:
       - name: 'package.json matches package-lock.json'
         uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
         with:
+          token: ${{ github.token }}
           prereq-pattern: 'package-lock.json'
           file-pattern: 'package.json'
           skip-label: 'skip package*.json'
@@ -35,6 +38,7 @@ jobs:
       - name: 'Tests'
         uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
         with:
+          token: ${{ github.token }}
           prereq-pattern: src/**/*.ts
           file-pattern: |
             src/**/*.test.ts

.gitignore

@@ -24,7 +24,6 @@ cucumber-report.json
 port.txt
 precommit.hook
 python_files/lib/**
-python_files/get-pip.py
 debug_coverage*/**
 languageServer/**
 languageServer.*/**

.vscodeignore

@@ -63,6 +63,7 @@ out/test/**
 out/testMultiRootWkspc/**
 precommit.hook
 python_files/**/*.pyc
+python_files/download_get_pip.py
 python_files/lib/**/*.egg-info/**
 python_files/lib/jedilsp/bin/**
 python_files/lib/python/bin/**

build/azure-pipeline.pre-release.yml

@@ -87,6 +87,11 @@ extends:
           architecture: 'x64'
         displayName: Select Python version
 
+      - task: PipAuthenticate@1
+        inputs:
+          artifactFeeds: 'Monaco/vscode'
+        displayName: Authenticate to vscode feed
+
       - script: python -m pip install -U pip
         displayName: Upgrade pip
 
@@ -97,7 +102,7 @@ extends:
         displayName: Install NPM dependencies
 
       - script: nox --session install_python_libs
-        displayName: Install Jedi, get-pip, etc
+        displayName: Install Python extension dependencies
 
       - script: python ./build/update_package_file.py
         displayName: Update telemetry in package.json

build/azure-pipeline.stable.yml

@@ -81,6 +81,11 @@ extends:
           architecture: 'x64'
         displayName: Select Python version
 
+      - task: PipAuthenticate@1
+        inputs:
+          artifactFeeds: 'Monaco/vscode'
+        displayName: Authenticate to vscode feed
+
       - script: python -m pip install -U pip
         displayName: Upgrade pip
 
@@ -91,7 +96,7 @@ extends:
         displayName: Install NPM dependencies
 
       - script: nox --session install_python_libs
-        displayName: Install Jedi, get-pip, etc
+        displayName: Install Python extension dependencies
 
       - script: python ./build/update_package_file.py
         displayName: Update telemetry in package.json

build/build-install-requirements.txt

@@ -4,7 +4,7 @@
             "Component": {
                 "Other": {
                     "Name": "get-pip",
-                    "Version": "21.3.1",
+                    "Version": "26.2.1",
                     "DownloadUrl": "https://github.com/pypa/get-pip"
                 },
                 "Type": "other"

cgmanifest.json

@@ -55,13 +55,6 @@ def install_python_libs(session: nox.Session):
     session.install("packaging")
     session.install("debugpy")
 
-    # Download get-pip script
-    session.run(
-        "python",
-        "./python_files/download_get_pip.py",
-        env={"PYTHONPATH": "./python_files/lib/temp"},
-    )
-
     if pathlib.Path("./python_files/lib/temp").exists():
         shutil.rmtree("./python_files/lib/temp")