Skip to content

Commit 5a08e06

Browse files
committed
Merge remote-tracking branch 'upstream/main' into weasyprint
2 parents 0488652 + 4fa81cc commit 5a08e06

2,077 files changed

Lines changed: 28437 additions & 16526 deletions

File tree

Some content is hidden

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

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"suppressNotifications": ["prEditedNotification"],
55
"extends": ["config:recommended"],
66
"labels": ["bot: dependencies"],
7+
"rebaseLabel": ["bot: rebase"],
78
"semanticCommits": "disabled",
89
"separateMajorMinor": false,
910
"prHourlyLimit": 10,

.github/workflows/daily.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ 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", "3.15"]
39+
exclude:
40+
# https://github.com/python/typeshed/issues/15694
41+
- os: "windows-latest"
42+
python-version: "3.10"
3943
fail-fast: false
4044

4145
steps:
42-
- uses: actions/checkout@v6
46+
- uses: actions/checkout@v7
4347
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
4448
uses: actions/setup-python@v6
4549
with:
@@ -63,7 +67,7 @@ jobs:
6367
shard-index: [0, 1, 2, 3]
6468
fail-fast: false
6569
steps:
66-
- uses: actions/checkout@v6
70+
- uses: actions/checkout@v7
6771
- uses: actions/setup-python@v6
6872
with:
6973
python-version: "3.13"
@@ -111,26 +115,22 @@ jobs:
111115
runs-on: ubuntu-latest
112116
steps:
113117
- name: Checkout typeshed
114-
uses: actions/checkout@v6
118+
uses: actions/checkout@v7
115119
with:
116120
path: typeshed
117121
- name: Checkout stub_uploader
118-
uses: actions/checkout@v6
122+
uses: actions/checkout@v7
119123
with:
120124
repository: typeshed-internal/stub_uploader
121125
path: stub_uploader
122-
- uses: actions/setup-python@v6
123-
with:
124-
# Keep in sync with stub_uploader's check_scripts.yml workflow.
125-
python-version: "3.13"
126-
- uses: astral-sh/setup-uv@v7
126+
- uses: astral-sh/setup-uv@v8.2.0
127127
with:
128128
version-file: "typeshed/requirements-tests.txt"
129129
- name: Run tests
130130
run: |
131131
cd stub_uploader
132-
uv pip install -r requirements.txt --system
133-
python -m pytest tests
132+
# Keep Python version in sync with stub_uploader's check_scripts.yml workflow.
133+
uv run --python=3.13 --no-project --with-requirements=requirements.txt -m pytest tests
134134
135135
# https://github.community/t/run-github-actions-job-only-if-previous-job-has-failed/174786/2
136136
create-issue-on-failure:
@@ -141,7 +141,7 @@ jobs:
141141
permissions:
142142
issues: write
143143
steps:
144-
- uses: actions/github-script@v8
144+
- uses: actions/github-script@v9
145145
with:
146146
github-token: ${{ secrets.GITHUB_TOKEN }}
147147
script: |

.github/workflows/meta_tests.yml

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,18 @@ jobs:
3535
platform: ["linux", "win32"]
3636
fail-fast: false
3737
steps:
38-
- uses: actions/checkout@v6
39-
- uses: actions/setup-python@v6
40-
with:
41-
python-version: "3.13"
42-
- uses: astral-sh/setup-uv@v7
38+
- uses: actions/checkout@v7
39+
- uses: astral-sh/setup-uv@v8.2.0
4340
with:
4441
version-file: "requirements-tests.txt"
45-
- run: uv pip install -r requirements-tests.txt --system
46-
- run: python ./tests/typecheck_typeshed.py --platform=${{ matrix.platform }}
42+
- run: |
43+
uv run \
44+
--python=3.13 \
45+
--no-project \
46+
--with-requirements=requirements-tests.txt \
47+
./tests/typecheck_typeshed.py \
48+
--platform=${{ matrix.platform }}
49+
4750
pyright:
4851
name: Check scripts and tests with pyright
4952
runs-on: ubuntu-latest
@@ -52,35 +55,38 @@ jobs:
5255
python-platform: ["Linux", "Windows"]
5356
fail-fast: false
5457
steps:
55-
- uses: actions/checkout@v6
58+
- uses: actions/checkout@v7
5659
- uses: actions/setup-python@v6
5760
with:
5861
python-version: "3.13"
59-
- uses: astral-sh/setup-uv@v7
62+
- uses: astral-sh/setup-uv@v8.2.0
6063
with:
6164
version-file: "requirements-tests.txt"
6265
- run: uv pip install -r requirements-tests.txt --system
6366
- name: Run pyright on typeshed
64-
uses: jakebailey/pyright-action@v2
67+
uses: jakebailey/pyright-action@v3
6568
with:
6669
version: PATH
6770
python-platform: ${{ matrix.python-platform }}
68-
python-version: "3.9" # Oldest version supported for running scripts and tests
71+
python-version: "3.10" # Oldest version supported for running scripts and tests
6972
project: ./pyrightconfig.scripts_and_tests.json
73+
7074
stubsabot-dry-run:
7175
name: Stubsabot dry run
7276
runs-on: ubuntu-latest
7377
steps:
74-
- uses: actions/checkout@v6
75-
- uses: actions/setup-python@v6
76-
with:
77-
python-version: "3.13"
78-
- uses: astral-sh/setup-uv@v7
78+
- uses: actions/checkout@v7
79+
- uses: astral-sh/setup-uv@v8.2.0
7980
with:
8081
version-file: "requirements-tests.txt"
8182
- name: Git config
8283
run: |
8384
git config --global user.name stubsabot
8485
git config --global user.email '<>'
85-
- run: uv pip install -r requirements-tests.txt --system
86-
- run: python scripts/stubsabot.py --action-level local
86+
- run: |
87+
uv run \
88+
--python=3.13 \
89+
--no-project \
90+
--with-requirements=requirements-tests.txt \
91+
scripts/stubsabot.py \
92+
--action-level=local

.github/workflows/mypy_primer.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
shard-index: [0, 1, 2, 3]
25+
shard-index: [0, 1, 2, 3, 4, 5]
2626
fail-fast: false
2727
steps:
28-
- uses: actions/checkout@v6
28+
- uses: actions/checkout@v7
2929
with:
3030
path: typeshed_to_test
3131
fetch-depth: 0
@@ -52,7 +52,7 @@ jobs:
5252
--new v${MYPY_VERSION} --old v${MYPY_VERSION} \
5353
--custom-typeshed-repo typeshed_to_test \
5454
--new-typeshed $GITHUB_SHA --old-typeshed upstream_main \
55-
--num-shards 4 --shard-index ${{ matrix.shard-index }} \
55+
--num-shards 6 --shard-index ${{ matrix.shard-index }} \
5656
--debug \
5757
--output concise \
5858
| tee diff_${{ matrix.shard-index }}.txt
@@ -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@v6
65+
uses: actions/upload-artifact@v7
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@v6
73+
uses: actions/upload-artifact@v7
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@v6
87+
uses: actions/upload-artifact/merge@v7
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@v8
21+
uses: actions/github-script@v9
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@v8
47+
uses: actions/github-script@v9
4848
with:
4949
github-token: ${{ secrets.GITHUB_TOKEN }}
5050
script: |

.github/workflows/stubsabot.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,27 @@ jobs:
1919
if: github.repository == 'python/typeshed'
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v7
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@v6
28-
with:
29-
python-version: "3.13"
30-
- uses: astral-sh/setup-uv@v7
27+
- uses: astral-sh/setup-uv@v8.2.0
3128
with:
3229
version-file: "requirements-tests.txt"
3330
- name: git config
3431
run: |
3532
git config --global user.name stubsabot
3633
git config --global user.email '<>'
37-
- name: Install dependencies
38-
run: uv pip install -r requirements-tests.txt --system
3934
- name: Run stubsabot
40-
run: GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python scripts/stubsabot.py --action-level everything
35+
run: |
36+
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
37+
uv run \
38+
--python=3.13 \
39+
--no-project \
40+
--with-requirements=requirements-tests.txt \
41+
scripts/stubsabot.py \
42+
--action-level=everything
4143
4244
# https://github.community/t/run-github-actions-job-only-if-previous-job-has-failed/174786/2
4345
create-issue-on-failure:
@@ -46,7 +48,7 @@ jobs:
4648
needs: [stubsabot]
4749
if: ${{ github.repository == 'python/typeshed' && always() && (needs.stubsabot.result == 'failure') }}
4850
steps:
49-
- uses: actions/github-script@v8
51+
- uses: actions/github-script@v9
5052
with:
5153
github-token: ${{ secrets.GITHUB_TOKEN }}
5254
script: |

.github/workflows/stubtest_stdlib.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ 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", "3.15"]
35+
exclude:
36+
# https://github.com/python/typeshed/issues/15694
37+
- os: "windows-latest"
38+
python-version: "3.10"
3539
fail-fast: false
3640

3741
steps:
38-
- uses: actions/checkout@v6
42+
- uses: actions/checkout@v7
3943
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
4044
uses: actions/setup-python@v6
4145
with:

.github/workflows/stubtest_third_party.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737

3838
steps:
39-
- uses: actions/checkout@v6
39+
- uses: actions/checkout@v7
4040
with:
4141
fetch-depth: 0
4242
- uses: actions/setup-python@v6

0 commit comments

Comments
 (0)