Skip to content

Commit 674bfa3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into ci-cpython-like-args
2 parents 7b47348 + 33c0cf7 commit 674bfa3

47 files changed

Lines changed: 1102 additions & 382 deletions

Some content is hidden

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

.cspell.dict/cpython.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ argdefs
44
argtypes
55
asdl
66
asname
7+
ASNATIVEBYTES
78
atopen
89
atext
910
attro

.github/workflows/ci.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
# Flag that is raised when any rust code is changed.
4545
rust_code: ${{ steps.check_rust_code.outputs.changed }}
4646
steps:
47-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
47+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4848
with:
4949
fetch-depth: 0
5050
persist-credentials: false
@@ -88,7 +88,7 @@ jobs:
8888
os: [macos-latest, ubuntu-latest, windows-2025]
8989
fail-fast: false
9090
steps:
91-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
91+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9292
with:
9393
persist-credentials: false
9494

@@ -204,7 +204,7 @@ jobs:
204204
target: x86_64-apple-darwin
205205
fail-fast: false
206206
steps:
207-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
207+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
208208
with:
209209
persist-credentials: false
210210

@@ -321,7 +321,7 @@ jobs:
321321
timeout: 50
322322
fail-fast: false
323323
steps:
324-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
324+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
325325
with:
326326
persist-credentials: false
327327

@@ -465,7 +465,7 @@ jobs:
465465
- ubuntu-latest
466466
- windows-latest
467467
steps:
468-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
468+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
469469
with:
470470
persist-credentials: false
471471

@@ -503,13 +503,13 @@ jobs:
503503
needs.determine_changes.outputs.rust_code == 'true' ||
504504
github.ref == 'refs/heads/main'
505505
steps:
506-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
506+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
507507
with:
508508
persist-credentials: false
509509

510510
- uses: dtolnay/rust-toolchain@stable
511511

512-
- uses: cargo-bins/cargo-binstall@30b5ca8b54e1dcffd9548bc87ede1531310fdc67 # v1.20.0
512+
- uses: cargo-bins/cargo-binstall@732870f031d2fb36309d0deaf36abcc704a7be65 # v1.20.1
513513

514514
- name: cargo shear
515515
run: |
@@ -526,7 +526,7 @@ jobs:
526526
pull-requests: write
527527
security-events: write # for zizmor
528528
steps:
529-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
529+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
530530
with:
531531
persist-credentials: false
532532

@@ -540,7 +540,7 @@ jobs:
540540
uses: reviewdog/action-actionlint@6fb7acc99f4a1008869fa8a0f09cfca740837d9d # v1.72.0
541541

542542
- name: zizmor
543-
uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
543+
uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
544544

545545
- name: restore prek cache
546546
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -566,7 +566,7 @@ jobs:
566566
echo "version=${version}" >> "$GITHUB_OUTPUT"
567567
568568
- name: Clone CPython
569-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
569+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
570570
with:
571571
repository: python/cpython
572572
path: cpython
@@ -591,7 +591,7 @@ jobs:
591591

592592
- name: reviewdog
593593
if: ${{ !cancelled() }}
594-
uses: reviewdog/action-suggester@aa38384ceb608d00f84b4690cacc83a5aba307ff # v1.24.0
594+
uses: reviewdog/action-suggester@2558ba17e65a9039e73764a73009fc05fef28a46 # v1.24.3
595595
with:
596596
level: warning
597597
fail_level: error
@@ -604,7 +604,7 @@ jobs:
604604
env:
605605
NIGHTLY_CHANNEL: nightly
606606
steps:
607-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
607+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
608608
with:
609609
persist-credentials: false
610610

@@ -639,7 +639,7 @@ jobs:
639639
runs-on: ubuntu-latest
640640
timeout-minutes: 30
641641
steps:
642-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
642+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
643643
with:
644644
persist-credentials: false
645645

@@ -754,7 +754,7 @@ jobs:
754754
runs-on: ubuntu-latest
755755
timeout-minutes: 30
756756
steps:
757-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
757+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
758758
with:
759759
persist-credentials: false
760760

@@ -806,7 +806,7 @@ jobs:
806806
name: cargo doc
807807
runs-on: ubuntu-latest
808808
steps:
809-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
809+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
810810
with:
811811
persist-credentials: false
812812

.github/workflows/cron-ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
INSTA_WORKSPACE_ROOT: ${{ github.workspace }}
2929
steps:
30-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
30+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3131
with:
3232
persist-credentials: false
3333

@@ -67,7 +67,7 @@ jobs:
6767
# Disable this scheduled job when running on a fork.
6868
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
6969
steps:
70-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
70+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7171
with:
7272
persist-credentials: true
7373

@@ -105,7 +105,7 @@ jobs:
105105
# Disable this scheduled job when running on a fork.
106106
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
107107
steps:
108-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
108+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
109109
with:
110110
persist-credentials: true
111111

@@ -168,7 +168,7 @@ jobs:
168168
# Disable this scheduled job when running on a fork.
169169
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
170170
steps:
171-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
171+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
172172
with:
173173
persist-credentials: true
174174

.github/workflows/lib-deps-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
timeout-minutes: 10
1919
steps:
2020
- name: Checkout base branch
21-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
21+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2222
with:
2323
# Use base branch for scripts (security: don't run PR code with elevated permissions)
2424
ref: ${{ github.event.pull_request.base.ref }}
@@ -41,7 +41,7 @@ jobs:
4141
echo "version=${version}" >> "$GITHUB_OUTPUT"
4242
4343
- name: Checkout CPython
44-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
44+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4545
with:
4646
repository: python/cpython
4747
path: cpython

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# target: aarch64-pc-windows-msvc
5353
fail-fast: false
5454
steps:
55-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
55+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5656
with:
5757
persist-credentials: false
5858

@@ -91,7 +91,7 @@ jobs:
9191
permissions:
9292
contents: read
9393
steps:
94-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
94+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9595
with:
9696
persist-credentials: false
9797

@@ -156,7 +156,7 @@ jobs:
156156
permissions:
157157
contents: write # for creating a release
158158
steps:
159-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
159+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
160160
with:
161161
persist-credentials: false
162162

.github/workflows/update-caches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
target: ""
4040
steps:
4141
- name: Checkout RustPython main branch
42-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
42+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4343
with:
4444
repository: RustPython/RustPython
4545
ref: main

.github/workflows/update-doc-db.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- windows-latest
3131
- macos-latest
3232
steps:
33-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
33+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3434
with:
3535
persist-credentials: false
3636
sparse-checkout: |
@@ -58,7 +58,7 @@ jobs:
5858
contents: write
5959
pull-requests: write
6060
steps:
61-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
61+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6262
with:
6363
persist-credentials: true
6464
ref: ${{ inputs.base-ref }}

.github/workflows/update-libs-status.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: ${{ github.repository == 'RustPython/RustPython' }}
2222
steps:
2323
- name: Clone RustPython
24-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
24+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2525
with:
2626
path: rustpython
2727
persist-credentials: false
@@ -37,7 +37,7 @@ jobs:
3737
echo "version=${version}" >> "$GITHUB_OUTPUT"
3838
3939
- name: Clone CPython
40-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
40+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4141
with:
4242
repository: python/cpython
4343
path: cpython

.github/workflows/upgrade-pylib.lock.yml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
priority: 0
1111

1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.15.17
13+
rev: v0.15.18
1414
hooks:
1515
- id: ruff-format
1616
priority: 0
@@ -63,7 +63,7 @@ repos:
6363
- manual
6464

6565
- repo: https://github.com/streetsidesoftware/cspell-cli
66-
rev: v10.0.0
66+
rev: v10.0.1
6767
hooks:
6868
- id: cspell
6969
types: [rust]

0 commit comments

Comments
 (0)