python upstream merge v2025.6.1

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

@@ -31,10 +31,10 @@ runs:
       uses: dtolnay/rust-toolchain@stable
 
     # Jedi LS depends on dataclasses which is not in the stdlib in Python 3.7.
-    - name: Use Python 3.8 for JediLSP
+    - name: Use Python 3.9 for JediLSP
       uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.9
         cache: 'pip'
         cache-dependency-path: |
           requirements.txt

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

@@ -13,13 +13,13 @@ runs:
   using: 'composite'
   steps:
     - name: Install Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node_version }}
         cache: 'npm'
 
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
         cache: 'pip'

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

@@ -162,7 +162,7 @@ jobs:
         # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
         os: [ubuntu-latest, windows-latest]
         # Run the tests on the oldest and most recent versions of Python.
-        python: ['3.8', '3.x', '3.13-dev']
+        python: ['3.9', '3.x', '3.13']
 
     steps:
       - name: Checkout

extensions/positron-python/.github/workflows/pr-check.yml

@@ -144,7 +144,7 @@ jobs:
         # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
         os: [ubuntu-latest, windows-latest]
         # Run the tests on the oldest and most recent versions of Python.
-        python: ['3.8', '3.x', '3.13-dev'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release
+        python: ['3.9', '3.x', '3.13'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release
         pytest-version: ['pytest', 'pytest@pre-release', 'pytest==6.2.0']
 
     steps:

extensions/positron-python/.github/workflows/pr-file-check.yml

@@ -47,7 +47,8 @@ jobs:
           script: |
             const labels = context.payload.pull_request.labels.map(label => label.name);
             if (!labels.includes('skip-issue-check')) {
-              const issueLink = context.payload.pull_request.body.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
+              const prBody = context.payload.pull_request.body || '';
+              const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
               if (!issueLink) {
                 core.setFailed('No associated issue found in the PR description.');
               }

extensions/positron-python/.vscodeignore

@@ -1,5 +1,6 @@
 **/*.map
 **/*.analyzer.html
+**/.env
 *.vsix
 .editorconfig
 .env

extensions/positron-python/build/azure-pipeline.pre-release.yml

@@ -71,7 +71,7 @@ extends:
 
       - task: UsePythonVersion@0
         inputs:
-          versionSpec: '3.8'
+          versionSpec: '3.9'
           addToPath: true
           architecture: 'x64'
         displayName: Select Python version

extensions/positron-python/build/azure-pipeline.stable.yml

@@ -65,7 +65,7 @@ extends:
 
       - task: UsePythonVersion@0
         inputs:
-          versionSpec: '3.8'
+          versionSpec: '3.9'
           addToPath: true
           architecture: 'x64'
         displayName: Select Python version

extensions/positron-python/build/ci/conda_env_1.yml

@@ -1,4 +1,4 @@
 name: conda_env_1
 dependencies:
-  - python=3.8
+  - python=3.9
   - pip

extensions/positron-python/build/ci/conda_env_2.yml

@@ -1,4 +1,4 @@
 name: conda_env_2
 dependencies:
-  - python=3.8
+  - python=3.9
   - pip

extensions/positron-python/build/test-requirements.txt

@@ -28,10 +28,10 @@ namedpipe; platform_system == "Windows"
 # typing for Django files
 django-stubs
 
-# for coverage
 coverage
 pytest-cov
 pytest-json
+pytest-timeout
 
 
 # for pytest-describe related tests