Skip to content

Commit 59f5997

Browse files
authored
Merge branch 'main' into fix-lambda-comment-parsing
2 parents 629d359 + c9523f4 commit 59f5997

Some content is hidden

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

85 files changed

+1821
-558
lines changed

.flake8

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[flake8]
2-
# B905 should be enabled when we drop support for 3.9
3-
ignore = E203, E266, E501, E701, E704, W503, B905, B907
2+
ignore = E203, E266, E501, E701, E704, W503, B907
43
# line length is intentionally set to 80 here because black uses Bugbear
54
# See https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#bugbear for more details
65
max-line-length = 80
76
max-complexity = 18
8-
select = B,C,E,F,W,T4,B9
7+
select = B,E,F,W,T4,B9

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ this = "code"
4141
And run it with these arguments:
4242

4343
```sh
44-
$ black file.py --target-version py39
44+
$ black file.py --target-version py310
4545
```
4646

4747
The resulting error is:

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818

1919
- name: Grep CHANGES.md for PR number
2020
if: contains(github.event.pull_request.labels.*.name, 'skip news') != true

.github/workflows/diff_shades.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
matrix: ${{ steps.set-config.outputs.matrix }}
2626

2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929

3030
- uses: actions/setup-python@v6
3131
with:
32-
python-version: "3.11"
32+
python-version: "3.13"
3333

3434
- name: Install diff-shades and support dependencies
3535
run: |
@@ -53,14 +53,14 @@ jobs:
5353

5454
steps:
5555
- name: Checkout this repository (full clone)
56-
uses: actions/checkout@v5
56+
uses: actions/checkout@v6
5757
with:
5858
# The baseline revision could be rather old so a full clone is ideal.
5959
fetch-depth: 0
6060

6161
- uses: actions/setup-python@v6
6262
with:
63-
python-version: "3.11"
63+
python-version: "3.13"
6464

6565
- name: Install diff-shades
6666
run: |
@@ -90,7 +90,7 @@ jobs:
9090
-v --work-dir projects-cache/ ${{ matrix.force-flag }}
9191
9292
- name: Upload baseline analysis
93-
uses: actions/upload-artifact@v4
93+
uses: actions/upload-artifact@v5
9494
with:
9595
name: ${{ matrix.baseline-analysis }}
9696
path: ${{ matrix.baseline-analysis }}
@@ -106,14 +106,14 @@ jobs:
106106

107107
steps:
108108
- name: Checkout this repository (full clone)
109-
uses: actions/checkout@v5
109+
uses: actions/checkout@v6
110110
with:
111111
# The baseline revision could be rather old so a full clone is ideal.
112112
fetch-depth: 0
113113

114114
- uses: actions/setup-python@v6
115115
with:
116-
python-version: "3.11"
116+
python-version: "3.13"
117117

118118
- name: Install diff-shades
119119
run: |
@@ -151,7 +151,7 @@ jobs:
151151
-v --work-dir projects-cache/ ${{ matrix.force-flag }}
152152
153153
- name: Upload target analysis
154-
uses: actions/upload-artifact@v4
154+
uses: actions/upload-artifact@v5
155155
with:
156156
name: ${{ matrix.target-analysis }}
157157
path: ${{ matrix.target-analysis }}
@@ -163,22 +163,23 @@ jobs:
163163
compare:
164164
name: compare / ${{ matrix.mode }}
165165
needs: ["configure", "analysis-base", "analysis-target"]
166+
if: ${{ !cancelled() }}
166167
runs-on: ubuntu-latest
167168
strategy:
168169
fail-fast: false
169170
matrix:
170171
include: ${{ fromJson(needs.configure.outputs.matrix) }}
171172

172173
steps:
173-
- uses: actions/checkout@v5
174+
- uses: actions/checkout@v6
174175

175-
- uses: actions/download-artifact@v5
176+
- uses: actions/download-artifact@v6
176177
with:
177178
merge-multiple: true
178179

179180
- uses: actions/setup-python@v6
180181
with:
181-
python-version: "3.11"
182+
python-version: "3.13"
182183

183184
- name: Install diff-shades and support dependencies
184185
run: |
@@ -191,7 +192,7 @@ jobs:
191192
${{ matrix.baseline-analysis }} ${{ matrix.target-analysis }}
192193
193194
- name: Upload diff report
194-
uses: actions/upload-artifact@v4
195+
uses: actions/upload-artifact@v5
195196
with:
196197
name: ${{ matrix.mode }}-diff.html
197198
path: diff.html
@@ -206,7 +207,7 @@ jobs:
206207
207208
- name: Upload summary file (PR only)
208209
if: github.event_name == 'pull_request' && matrix.mode == 'preview-new-changes'
209-
uses: actions/upload-artifact@v4
210+
uses: actions/upload-artifact@v5
210211
with:
211212
name: .pr-comment.json
212213
path: .pr-comment.json

.github/workflows/diff_shades_comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
comment:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
- uses: actions/setup-python@v6
1717
with:
18-
python-version: "*"
18+
python-version: "3.13"
1919

2020
- name: Install support dependencies
2121
run: |

.github/workflows/doc.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Documentation
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
paths: ["docs/**", "pyproject.toml", ".github/workflows/*"]
6+
7+
pull_request:
8+
paths: ["docs/**", "pyproject.toml", ".github/workflows/*"]
49

510
permissions:
611
contents: read
@@ -21,7 +26,7 @@ jobs:
2126

2227
runs-on: ${{ matrix.os }}
2328
steps:
24-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
2530

2631
- name: Set up latest Python
2732
uses: actions/setup-python@v6

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020

2121
- name: Set up QEMU
2222
uses: docker/setup-qemu-action@v3

.github/workflows/fuzz.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
name: Fuzz
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
paths-ignore:
6+
- "docs/**"
7+
- "*.md"
8+
9+
pull_request:
10+
paths-ignore:
11+
- "docs/**"
12+
- "*.md"
413

514
concurrency:
615
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -22,10 +31,10 @@ jobs:
2231
strategy:
2332
fail-fast: false
2433
matrix:
25-
python-version: ["3.9", "3.10", "3.11", "3.12.4", "3.13"]
34+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2635

2736
steps:
28-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
2938

3039
- name: Set up Python ${{ matrix.python-version }}
3140
uses: actions/setup-python@v6

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818

1919
- name: Assert PR target is main
2020
if: github.event_name == 'pull_request' && github.repository == 'psf/black'

.github/workflows/pypi_upload.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: github.event_name == 'release'
1919

2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222

2323
- name: Set up latest Python
2424
uses: actions/setup-python@v6
@@ -46,36 +46,39 @@ jobs:
4646
outputs:
4747
include: ${{ steps.set-matrix.outputs.include }}
4848
steps:
49-
- uses: actions/checkout@v5
49+
- uses: actions/checkout@v6
5050
# Keep cibuildwheel version in sync with below
5151
- name: Install cibuildwheel and pypyp
5252
run: |
53-
pipx install cibuildwheel==2.23.3
53+
pipx install cibuildwheel==3.2.1
5454
pipx install pypyp==1.3.0
5555
- name: generate matrix
56-
if: github.event_name != 'pull_request'
56+
if: |
57+
github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci: build all wheels')
5758
run: |
5859
{
5960
cibuildwheel --print-build-identifiers --platform linux \
6061
| pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' \
6162
&& cibuildwheel --print-build-identifiers --platform macos \
6263
| pyp 'json.dumps({"only": x, "os": "macos-latest"})' \
6364
&& cibuildwheel --print-build-identifiers --platform windows \
64-
| pyp 'json.dumps({"only": x, "os": "windows-latest"})'
65+
| pyp 'json.dumps({"only": x, "os": "windows-latest"})' \
66+
&& cibuildwheel --print-build-identifiers --platform windows --archs ARM64 \
67+
| pyp 'json.dumps({"only": x, "os": "windows-11-arm"})'
6568
} | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
6669
env:
6770
CIBW_ARCHS_LINUX: x86_64
6871
CIBW_ARCHS_MACOS: x86_64 arm64
6972
CIBW_ARCHS_WINDOWS: AMD64
7073
- name: generate matrix (PR)
71-
if: github.event_name == 'pull_request'
74+
if: |
75+
github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ci: build all wheels')
7276
run: |
7377
{
74-
cibuildwheel --print-build-identifiers --platform linux \
75-
| pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})'
78+
CIBW_BUILD="cp310-*" cibuildwheel --print-build-identifiers --platform linux | pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})'
79+
CIBW_BUILD="cp314-*" cibuildwheel --print-build-identifiers --platform windows | pyp 'json.dumps({"only": x, "os": "windows-latest"})'
7680
} | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
7781
env:
78-
CIBW_BUILD: "cp39-* cp313-*"
7982
CIBW_ARCHS_LINUX: x86_64
8083
- id: set-matrix
8184
run: echo "include=$(cat /tmp/matrix)" | tee -a $GITHUB_OUTPUT
@@ -90,14 +93,14 @@ jobs:
9093
include: ${{ fromJson(needs.generate_wheels_matrix.outputs.include) }}
9194

9295
steps:
93-
- uses: actions/checkout@v5
96+
- uses: actions/checkout@v6
9497
# Keep cibuildwheel version in sync with above
95-
- uses: pypa/cibuildwheel@v2.23.3
98+
- uses: pypa/cibuildwheel@v3.3.0
9699
with:
97100
only: ${{ matrix.only }}
98101

99102
- name: Upload wheels as workflow artifacts
100-
uses: actions/upload-artifact@v4
103+
uses: actions/upload-artifact@v5
101104
with:
102105
name: ${{ matrix.only }}-mypyc-wheels
103106
path: ./wheelhouse/*.whl
@@ -118,7 +121,7 @@ jobs:
118121

119122
steps:
120123
- name: Checkout stable branch
121-
uses: actions/checkout@v5
124+
uses: actions/checkout@v6
122125
with:
123126
ref: stable
124127
fetch-depth: 0

0 commit comments

Comments
 (0)