Skip to content

Commit e460c80

Browse files
dcreagerdcreager
committed
Merge branch 'main' into dcreager/union-callables
* main: (25 commits) [syntax-errors] Parenthesized context managers before Python 3.9 (#16523) [ci]: Disable wheel testing on `ppc64le` (#16793) [red-knot] Stabilize `negation_reverses_subtype_order` property test (#16801) [red-knot] Emit error if int/float/complex/bytes/boolean literals appear in type expressions outside `typing.Literal[]` (#16765) [ci] Use `git diff` instead of `changed-files` GH action (#16796) [syntax-errors] Improve error message and range for pre-PEP-614 decorator syntax errors (#16581) [`flake8-bandit`] Allow raw strings in `suspicious-mark-safe-usage` (`S308`) #16702 (#16770) [`refurb`] Avoid panicking `unwrap` in `verbose-decimal-constructor` (`FURB157`) (#16777) [red-knot] Add `--color` CLI option (#16758) [internal]: Upgrade salsa (#16794) Pin dependencies (#16791) [internal]: Update indirect dependencies (#16792) [ci]: Fixup codspeed upgrade (#16790) Update Rust crate compact_str to 0.9.0 (#16785) Update Rust crate clap to v4.5.32 (#16778) Update Rust crate codspeed-criterion-compat to v2.9.1 (#16784) Update Rust crate quote to v1.0.40 (#16782) Update Rust crate ordermap to v0.5.6 (#16781) Update cloudflare/wrangler-action action to v3.14.1 (#16783) Update Rust crate env_logger to v0.11.7 (#16779) ...
2 parents 6dc3dcf + 75a562d commit e460c80

File tree

81 files changed

+2568
-604
lines changed

Some content is hidden

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

81 files changed

+2568
-604
lines changed

‎.github/renovate.json5‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@
4040
enabled: true,
4141
},
4242
packageRules: [
43+
// Pin GitHub Actions to immutable SHAs.
44+
{
45+
matchDepTypes: ["action"],
46+
pinDigests: true,
47+
},
48+
// Annotate GitHub Actions SHAs with a SemVer version.
49+
{
50+
extends: ["helpers:pinGitHubActionDigests"],
51+
extractVersion: "^(?<version>v?\\d+\\.\\d+\\.\\d+)$",
52+
versioning: "regex:^v?(?<major>\\d+)(\\.(?<minor>\\d+)\\.(?<patch>\\d+))?$",
53+
},
4354
{
4455
// Group upload/download artifact updates, the versions are dependent
4556
groupName: "Artifact GitHub Actions dependencies",

‎.github/workflows/build-binaries.yml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ jobs:
3939
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
4040
runs-on: ubuntu-latest
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4343
with:
4444
submodules: recursive
4545
persist-credentials: false
46-
- uses: actions/setup-python@v5
46+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
4747
with:
4848
python-version: ${{ env.PYTHON_VERSION }}
4949
- name: "Prep README.md"
5050
run: python scripts/transform_readme.py --target pypi
5151
- name: "Build sdist"
52-
uses: PyO3/maturin-action@v1
52+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
5353
with:
5454
command: sdist
5555
args: --out dist
@@ -59,7 +59,7 @@ jobs:
5959
"${MODULE_NAME}" --help
6060
python -m "${MODULE_NAME}" --help
6161
- name: "Upload sdist"
62-
uses: actions/upload-artifact@v4
62+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
6363
with:
6464
name: wheels-sdist
6565
path: dist
@@ -68,23 +68,23 @@ jobs:
6868
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
6969
runs-on: macos-14
7070
steps:
71-
- uses: actions/checkout@v4
71+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
7272
with:
7373
submodules: recursive
7474
persist-credentials: false
75-
- uses: actions/setup-python@v5
75+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
7676
with:
7777
python-version: ${{ env.PYTHON_VERSION }}
7878
architecture: x64
7979
- name: "Prep README.md"
8080
run: python scripts/transform_readme.py --target pypi
8181
- name: "Build wheels - x86_64"
82-
uses: PyO3/maturin-action@v1
82+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
8383
with:
8484
target: x86_64
8585
args: --release --locked --out dist
8686
- name: "Upload wheels"
87-
uses: actions/upload-artifact@v4
87+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
8888
with:
8989
name: wheels-macos-x86_64
9090
path: dist
@@ -99,7 +99,7 @@ jobs:
9999
tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
100100
shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
101101
- name: "Upload binary"
102-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
103103
with:
104104
name: artifacts-macos-x86_64
105105
path: |
@@ -110,18 +110,18 @@ jobs:
110110
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
111111
runs-on: macos-14
112112
steps:
113-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
114114
with:
115115
submodules: recursive
116116
persist-credentials: false
117-
- uses: actions/setup-python@v5
117+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
118118
with:
119119
python-version: ${{ env.PYTHON_VERSION }}
120120
architecture: arm64
121121
- name: "Prep README.md"
122122
run: python scripts/transform_readme.py --target pypi
123123
- name: "Build wheels - aarch64"
124-
uses: PyO3/maturin-action@v1
124+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
125125
with:
126126
target: aarch64
127127
args: --release --locked --out dist
@@ -131,7 +131,7 @@ jobs:
131131
ruff --help
132132
python -m ruff --help
133133
- name: "Upload wheels"
134-
uses: actions/upload-artifact@v4
134+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
135135
with:
136136
name: wheels-aarch64-apple-darwin
137137
path: dist
@@ -146,7 +146,7 @@ jobs:
146146
tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
147147
shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
148148
- name: "Upload binary"
149-
uses: actions/upload-artifact@v4
149+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
150150
with:
151151
name: artifacts-aarch64-apple-darwin
152152
path: |
@@ -166,18 +166,18 @@ jobs:
166166
- target: aarch64-pc-windows-msvc
167167
arch: x64
168168
steps:
169-
- uses: actions/checkout@v4
169+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
170170
with:
171171
submodules: recursive
172172
persist-credentials: false
173-
- uses: actions/setup-python@v5
173+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
174174
with:
175175
python-version: ${{ env.PYTHON_VERSION }}
176176
architecture: ${{ matrix.platform.arch }}
177177
- name: "Prep README.md"
178178
run: python scripts/transform_readme.py --target pypi
179179
- name: "Build wheels"
180-
uses: PyO3/maturin-action@v1
180+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
181181
with:
182182
target: ${{ matrix.platform.target }}
183183
args: --release --locked --out dist
@@ -192,7 +192,7 @@ jobs:
192192
"${MODULE_NAME}" --help
193193
python -m "${MODULE_NAME}" --help
194194
- name: "Upload wheels"
195-
uses: actions/upload-artifact@v4
195+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
196196
with:
197197
name: wheels-${{ matrix.platform.target }}
198198
path: dist
@@ -203,7 +203,7 @@ jobs:
203203
7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
204204
sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
205205
- name: "Upload binary"
206-
uses: actions/upload-artifact@v4
206+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
207207
with:
208208
name: artifacts-${{ matrix.platform.target }}
209209
path: |
@@ -219,18 +219,18 @@ jobs:
219219
- x86_64-unknown-linux-gnu
220220
- i686-unknown-linux-gnu
221221
steps:
222-
- uses: actions/checkout@v4
222+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
223223
with:
224224
submodules: recursive
225225
persist-credentials: false
226-
- uses: actions/setup-python@v5
226+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
227227
with:
228228
python-version: ${{ env.PYTHON_VERSION }}
229229
architecture: x64
230230
- name: "Prep README.md"
231231
run: python scripts/transform_readme.py --target pypi
232232
- name: "Build wheels"
233-
uses: PyO3/maturin-action@v1
233+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
234234
with:
235235
target: ${{ matrix.target }}
236236
manylinux: auto
@@ -242,7 +242,7 @@ jobs:
242242
"${MODULE_NAME}" --help
243243
python -m "${MODULE_NAME}" --help
244244
- name: "Upload wheels"
245-
uses: actions/upload-artifact@v4
245+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
246246
with:
247247
name: wheels-${{ matrix.target }}
248248
path: dist
@@ -260,7 +260,7 @@ jobs:
260260
tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
261261
shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
262262
- name: "Upload binary"
263-
uses: actions/upload-artifact@v4
263+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
264264
with:
265265
name: artifacts-${{ matrix.target }}
266266
path: |
@@ -294,24 +294,24 @@ jobs:
294294
arch: arm
295295

296296
steps:
297-
- uses: actions/checkout@v4
297+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
298298
with:
299299
submodules: recursive
300300
persist-credentials: false
301-
- uses: actions/setup-python@v5
301+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
302302
with:
303303
python-version: ${{ env.PYTHON_VERSION }}
304304
- name: "Prep README.md"
305305
run: python scripts/transform_readme.py --target pypi
306306
- name: "Build wheels"
307-
uses: PyO3/maturin-action@v1
307+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
308308
with:
309309
target: ${{ matrix.platform.target }}
310310
manylinux: auto
311311
docker-options: ${{ matrix.platform.maturin_docker_options }}
312312
args: --release --locked --out dist
313-
- uses: uraimo/run-on-arch-action@v2
314-
if: matrix.platform.arch != 'ppc64'
313+
- uses: uraimo/run-on-arch-action@ac33288c3728ca72563c97b8b88dda5a65a84448 # v2
314+
if: ${{ matrix.platform.arch != 'ppc64' && matrix.platform.arch != 'ppc64le'}}
315315
name: Test wheel
316316
with:
317317
arch: ${{ matrix.platform.arch == 'arm' && 'armv6' || matrix.platform.arch }}
@@ -325,7 +325,7 @@ jobs:
325325
pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
326326
ruff --help
327327
- name: "Upload wheels"
328-
uses: actions/upload-artifact@v4
328+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
329329
with:
330330
name: wheels-${{ matrix.platform.target }}
331331
path: dist
@@ -343,7 +343,7 @@ jobs:
343343
tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
344344
shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
345345
- name: "Upload binary"
346-
uses: actions/upload-artifact@v4
346+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
347347
with:
348348
name: artifacts-${{ matrix.platform.target }}
349349
path: |
@@ -359,18 +359,18 @@ jobs:
359359
- x86_64-unknown-linux-musl
360360
- i686-unknown-linux-musl
361361
steps:
362-
- uses: actions/checkout@v4
362+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
363363
with:
364364
submodules: recursive
365365
persist-credentials: false
366-
- uses: actions/setup-python@v5
366+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
367367
with:
368368
python-version: ${{ env.PYTHON_VERSION }}
369369
architecture: x64
370370
- name: "Prep README.md"
371371
run: python scripts/transform_readme.py --target pypi
372372
- name: "Build wheels"
373-
uses: PyO3/maturin-action@v1
373+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
374374
with:
375375
target: ${{ matrix.target }}
376376
manylinux: musllinux_1_2
@@ -387,7 +387,7 @@ jobs:
387387
.venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
388388
.venv/bin/${{ env.MODULE_NAME }} --help
389389
- name: "Upload wheels"
390-
uses: actions/upload-artifact@v4
390+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
391391
with:
392392
name: wheels-${{ matrix.target }}
393393
path: dist
@@ -405,7 +405,7 @@ jobs:
405405
tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
406406
shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
407407
- name: "Upload binary"
408-
uses: actions/upload-artifact@v4
408+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
409409
with:
410410
name: artifacts-${{ matrix.target }}
411411
path: |
@@ -425,23 +425,23 @@ jobs:
425425
arch: armv7
426426

427427
steps:
428-
- uses: actions/checkout@v4
428+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
429429
with:
430430
submodules: recursive
431431
persist-credentials: false
432-
- uses: actions/setup-python@v5
432+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
433433
with:
434434
python-version: ${{ env.PYTHON_VERSION }}
435435
- name: "Prep README.md"
436436
run: python scripts/transform_readme.py --target pypi
437437
- name: "Build wheels"
438-
uses: PyO3/maturin-action@v1
438+
uses: PyO3/maturin-action@36db84001d74475ad1b8e6613557ae4ee2dc3598 # v1
439439
with:
440440
target: ${{ matrix.platform.target }}
441441
manylinux: musllinux_1_2
442442
args: --release --locked --out dist
443443
docker-options: ${{ matrix.platform.maturin_docker_options }}
444-
- uses: uraimo/run-on-arch-action@v2
444+
- uses: uraimo/run-on-arch-action@ac33288c3728ca72563c97b8b88dda5a65a84448 # v2
445445
name: Test wheel
446446
with:
447447
arch: ${{ matrix.platform.arch }}
@@ -454,7 +454,7 @@ jobs:
454454
.venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
455455
.venv/bin/${{ env.MODULE_NAME }} --help
456456
- name: "Upload wheels"
457-
uses: actions/upload-artifact@v4
457+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
458458
with:
459459
name: wheels-${{ matrix.platform.target }}
460460
path: dist
@@ -472,7 +472,7 @@ jobs:
472472
tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
473473
shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
474474
- name: "Upload binary"
475-
uses: actions/upload-artifact@v4
475+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
476476
with:
477477
name: artifacts-${{ matrix.platform.target }}
478478
path: |

0 commit comments

Comments
 (0)