Skip to content

Commit 7fee9c8

Browse files
Merge branch 'main' into stubsabot/pyperclip
2 parents 8fa665a + aab5cc6 commit 7fee9c8

File tree

1,077 files changed

+15237
-9958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,077 files changed

+15237
-9958
lines changed

.github/workflows/daily.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
strategy:
3636
matrix:
3737
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
38-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
38+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
3939
fail-fast: false
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
4343
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
44-
uses: actions/setup-python@v5
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: ${{ matrix.python-version }}
4747
cache: pip
@@ -50,9 +50,6 @@ jobs:
5050
check-latest: true
5151
- name: Install dependencies
5252
run: pip install -r requirements-tests.txt
53-
# Temporary to get @disjoint_base support; can remove once mypy 1.18 is released
54-
- name: Install mypy from git
55-
run: pip install git+https://github.com/python/mypy.git@116b92bae7b5dbf5e6bd36fd9b0c6804973e5554
5653
- name: Run stubtest
5754
run: python tests/stubtest_stdlib.py
5855

@@ -66,8 +63,8 @@ jobs:
6663
shard-index: [0, 1, 2, 3]
6764
fail-fast: false
6865
steps:
69-
- uses: actions/checkout@v4
70-
- uses: actions/setup-python@v5
66+
- uses: actions/checkout@v6
67+
- uses: actions/setup-python@v6
7168
with:
7269
python-version: "3.13"
7370
cache: pip
@@ -114,19 +111,19 @@ jobs:
114111
runs-on: ubuntu-latest
115112
steps:
116113
- name: Checkout typeshed
117-
uses: actions/checkout@v4
114+
uses: actions/checkout@v6
118115
with:
119116
path: typeshed
120117
- name: Checkout stub_uploader
121-
uses: actions/checkout@v4
118+
uses: actions/checkout@v6
122119
with:
123120
repository: typeshed-internal/stub_uploader
124121
path: stub_uploader
125-
- uses: actions/setup-python@v5
122+
- uses: actions/setup-python@v6
126123
with:
127124
# Keep in sync with stub_uploader's check_scripts.yml workflow.
128125
python-version: "3.13"
129-
- uses: astral-sh/setup-uv@v6
126+
- uses: astral-sh/setup-uv@v7
130127
with:
131128
version-file: "typeshed/requirements-tests.txt"
132129
- name: Run tests
@@ -144,7 +141,7 @@ jobs:
144141
permissions:
145142
issues: write
146143
steps:
147-
- uses: actions/github-script@v7
144+
- uses: actions/github-script@v8
148145
with:
149146
github-token: ${{ secrets.GITHUB_TOKEN }}
150147
script: |

.github/workflows/meta_tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
platform: ["linux", "win32"]
3636
fail-fast: false
3737
steps:
38-
- uses: actions/checkout@v4
39-
- uses: actions/setup-python@v5
38+
- uses: actions/checkout@v6
39+
- uses: actions/setup-python@v6
4040
with:
4141
python-version: "3.13"
42-
- uses: astral-sh/setup-uv@v6
42+
- uses: astral-sh/setup-uv@v7
4343
with:
4444
version-file: "requirements-tests.txt"
4545
- run: uv pip install -r requirements-tests.txt --system
@@ -52,11 +52,11 @@ jobs:
5252
python-platform: ["Linux", "Windows"]
5353
fail-fast: false
5454
steps:
55-
- uses: actions/checkout@v4
56-
- uses: actions/setup-python@v5
55+
- uses: actions/checkout@v6
56+
- uses: actions/setup-python@v6
5757
with:
5858
python-version: "3.13"
59-
- uses: astral-sh/setup-uv@v6
59+
- uses: astral-sh/setup-uv@v7
6060
with:
6161
version-file: "requirements-tests.txt"
6262
- run: uv pip install -r requirements-tests.txt --system
@@ -65,17 +65,17 @@ jobs:
6565
with:
6666
version: PATH
6767
python-platform: ${{ matrix.python-platform }}
68-
python-version: "3.9" # Oldest version supported for running scripts and tests
68+
python-version: "3.10" # Oldest version supported for running scripts and tests
6969
project: ./pyrightconfig.scripts_and_tests.json
7070
stubsabot-dry-run:
7171
name: Stubsabot dry run
7272
runs-on: ubuntu-latest
7373
steps:
74-
- uses: actions/checkout@v4
75-
- uses: actions/setup-python@v5
74+
- uses: actions/checkout@v6
75+
- uses: actions/setup-python@v6
7676
with:
7777
python-version: "3.13"
78-
- uses: astral-sh/setup-uv@v6
78+
- uses: astral-sh/setup-uv@v7
7979
with:
8080
version-file: "requirements-tests.txt"
8181
- name: Git config

.github/workflows/mypy_primer.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
shard-index: [0, 1, 2, 3]
2626
fail-fast: false
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v6
2929
with:
3030
path: typeshed_to_test
3131
fetch-depth: 0
32-
- uses: actions/setup-python@v5
32+
- uses: actions/setup-python@v6
3333
with:
3434
python-version: "3.13"
3535
- name: Install dependencies
@@ -62,15 +62,15 @@ jobs:
6262
run: |
6363
echo ${{ github.event.pull_request.number }} | tee pr_number.txt
6464
- name: Upload mypy_primer diff + PR number
65-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v6
6666
if: ${{ matrix.shard-index == 0 }}
6767
with:
6868
name: mypy_primer_diffs-${{ matrix.shard-index }}
6969
path: |
7070
diff_${{ matrix.shard-index }}.txt
7171
pr_number.txt
7272
- name: Upload mypy_primer diff
73-
uses: actions/upload-artifact@v4
73+
uses: actions/upload-artifact@v6
7474
if: ${{ matrix.shard-index != 0 }}
7575
with:
7676
name: mypy_primer_diffs-${{ matrix.shard-index }}
@@ -84,7 +84,7 @@ jobs:
8484
contents: read
8585
steps:
8686
- name: Merge artifacts
87-
uses: actions/upload-artifact/merge@v4
87+
uses: actions/upload-artifact/merge@v6
8888
with:
8989
name: mypy_primer_diffs
9090
pattern: mypy_primer_diffs-*

.github/workflows/mypy_primer_comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1919
steps:
2020
- name: Download diffs
21-
uses: actions/github-script@v7
21+
uses: actions/github-script@v8
2222
with:
2323
script: |
2424
const fs = require('fs');
@@ -44,7 +44,7 @@ jobs:
4444
4545
- name: Post comment
4646
id: post-comment
47-
uses: actions/github-script@v7
47+
uses: actions/github-script@v8
4848
with:
4949
github-token: ${{ secrets.GITHUB_TOKEN }}
5050
script: |

.github/workflows/stubsabot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
if: github.repository == 'python/typeshed'
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
with:
2424
# use an ssh key so that checks automatically run on stubsabot PRs
2525
ssh-key: ${{ secrets.STUBSABOT_SSH_PRIVATE_KEY }}
2626
fetch-depth: 0
27-
- uses: actions/setup-python@v5
27+
- uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.13"
30-
- uses: astral-sh/setup-uv@v6
30+
- uses: astral-sh/setup-uv@v7
3131
with:
3232
version-file: "requirements-tests.txt"
3333
- name: git config
@@ -46,7 +46,7 @@ jobs:
4646
needs: [stubsabot]
4747
if: ${{ github.repository == 'python/typeshed' && always() && (needs.stubsabot.result == 'failure') }}
4848
steps:
49-
- uses: actions/github-script@v7
49+
- uses: actions/github-script@v8
5050
with:
5151
github-token: ${{ secrets.GITHUB_TOKEN }}
5252
script: |

.github/workflows/stubtest_stdlib.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
34-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
34+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
3535
fail-fast: false
3636

3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v6
3939
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
40-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@v6
4141
with:
4242
python-version: ${{ matrix.python-version }}
4343
cache: pip
@@ -46,8 +46,5 @@ jobs:
4646
check-latest: true
4747
- name: Install dependencies
4848
run: pip install -r requirements-tests.txt
49-
# Temporary to get @disjoint_base support; can remove once mypy 1.18 is released
50-
- name: Install mypy from git
51-
run: pip install git+https://github.com/python/mypy.git@116b92bae7b5dbf5e6bd36fd9b0c6804973e5554
5249
- name: Run stubtest
5350
run: python tests/stubtest_stdlib.py

.github/workflows/stubtest_third_party.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
fail-fast: false
3737

3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
4040
with:
4141
fetch-depth: 0
42-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4343
with:
4444
python-version: "3.13"
4545
cache: pip

.github/workflows/tests.yml

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
name: Check typeshed structure
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v4
30-
- uses: actions/setup-python@v5
29+
- uses: actions/checkout@v6
30+
- uses: actions/setup-python@v6
3131
with:
3232
python-version: "3.13"
33-
- uses: astral-sh/setup-uv@v6
33+
- uses: astral-sh/setup-uv@v7
3434
with:
3535
version-file: "requirements-tests.txt"
3636
- run: uv pip install -r requirements-tests.txt --system
@@ -42,15 +42,15 @@ jobs:
4242
strategy:
4343
matrix:
4444
platform: ["linux", "win32", "darwin"]
45-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
45+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
4646
fail-fast: false
4747
steps:
48-
- uses: actions/checkout@v4
49-
- uses: actions/setup-python@v5
48+
- uses: actions/checkout@v6
49+
- uses: actions/setup-python@v6
5050
with:
5151
python-version: ${{ matrix.python-version }}
5252
allow-prereleases: true
53-
- uses: astral-sh/setup-uv@v6
53+
- uses: astral-sh/setup-uv@v7
5454
with:
5555
version-file: "requirements-tests.txt"
5656
- run: uv pip install -r requirements-tests.txt --system
@@ -62,23 +62,17 @@ jobs:
6262
sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
6363
fi
6464
- name: Run mypy_test.py
65-
run: |
66-
# python-version can sometimes be pinned to a specific version or to "-dev", but
67-
# mypy understands only X.Y version numbers.
68-
MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
69-
python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${MYPY_PY_VERSION}
65+
run: python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${{ matrix.python-version }}
7066

7167
regression-tests:
7268
name: "mypy: Run test cases"
7369
runs-on: ubuntu-latest
7470
steps:
75-
- uses: actions/checkout@v4
76-
- uses: actions/setup-python@v5
71+
- uses: actions/checkout@v6
72+
- uses: actions/setup-python@v6
7773
with:
78-
# Use py311 for now, as py312 seems to be around 30s slower in CI
79-
# TODO: figure out why that is (#11590)
80-
python-version: "3.11"
81-
- uses: astral-sh/setup-uv@v6
74+
python-version: "3.14"
75+
- uses: astral-sh/setup-uv@v7
8276
with:
8377
version-file: "requirements-tests.txt"
8478
- run: uv pip install -r requirements-tests.txt --system
@@ -90,14 +84,14 @@ jobs:
9084
strategy:
9185
matrix:
9286
python-platform: ["Linux", "Windows", "Darwin"]
93-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
87+
python-version: ["3.11", "3.12", "3.13", "3.14"]
9488
fail-fast: false
9589
steps:
96-
- uses: actions/checkout@v4
97-
- uses: actions/setup-python@v5
90+
- uses: actions/checkout@v6
91+
- uses: actions/setup-python@v6
9892
with:
9993
python-version: "3.13"
100-
- uses: astral-sh/setup-uv@v6
94+
- uses: astral-sh/setup-uv@v7
10195
with:
10296
version-file: "requirements-tests.txt"
10397
- name: Install typeshed test-suite requirements
@@ -152,19 +146,19 @@ jobs:
152146
runs-on: ubuntu-latest
153147
steps:
154148
- name: Checkout typeshed
155-
uses: actions/checkout@v4
149+
uses: actions/checkout@v6
156150
with:
157151
path: typeshed
158152
- name: Checkout stub_uploader
159-
uses: actions/checkout@v4
153+
uses: actions/checkout@v6
160154
with:
161155
repository: typeshed-internal/stub_uploader
162156
path: stub_uploader
163-
- uses: actions/setup-python@v5
157+
- uses: actions/setup-python@v6
164158
with:
165159
# Keep in sync with stub_uploader's check_scripts.yml workflow.
166160
python-version: "3.13"
167-
- uses: astral-sh/setup-uv@v6
161+
- uses: astral-sh/setup-uv@v7
168162
with:
169163
version-file: "typeshed/requirements-tests.txt"
170164
- name: Run tests

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v5.0.0
3+
rev: v6.0.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
@@ -11,7 +11,7 @@ repos:
1111
args: [--fix=lf]
1212
- id: check-case-conflict
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.12.2 # must match requirements-tests.txt
14+
rev: v0.14.10 # must match requirements-tests.txt
1515
hooks:
1616
- id: ruff
1717
name: Run ruff on stubs, tests and scripts
@@ -27,7 +27,7 @@ repos:
2727
- "--unsafe-fixes"
2828
files: '.*test_cases/.+\.py$'
2929
- repo: https://github.com/psf/black-pre-commit-mirror
30-
rev: 25.1.0
30+
rev: 25.12.0
3131
hooks:
3232
- id: black
3333
- repo: https://github.com/pycqa/flake8

0 commit comments

Comments
 (0)