Skip to content

Commit 3eaa342

Browse files
ShaharNavehShaharNaveh
committed
Merge remote-tracking branch 'upstream/main' into ci-matrix-cargo-check
2 parents 7501452 + d248a04 commit 3eaa342

Some content is hidden

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

110 files changed

+4200
-1160
lines changed

‎.cspell.dict/cpython.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ prec
154154
preinitialized
155155
pybuilddir
156156
pycore
157+
pyinner
157158
pydecimal
158159
Pyfunc
159160
pylifecycle

‎.github/workflows/ci.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
os: [macos-latest, ubuntu-latest, windows-2025]
130130
fail-fast: false
131131
steps:
132-
- uses: actions/checkout@v6.0.2
132+
- uses: actions/checkout@v6
133133
- uses: dtolnay/rust-toolchain@stable
134134
with:
135135
components: clippy
@@ -267,7 +267,7 @@ jobs:
267267
- windows-2025
268268
fail-fast: false
269269
steps:
270-
- uses: actions/checkout@v6.0.2
270+
- uses: actions/checkout@v6
271271
- uses: dtolnay/rust-toolchain@stable
272272
- uses: Swatinem/rust-cache@v2
273273
- uses: actions/setup-python@v6.2.0
@@ -422,7 +422,7 @@ jobs:
422422
name: Lint Rust & Python code
423423
runs-on: ubuntu-latest
424424
steps:
425-
- uses: actions/checkout@v6.0.2
425+
- uses: actions/checkout@v6
426426
- uses: actions/setup-python@v6.2.0
427427
with:
428428
python-version: ${{ env.PYTHON_VERSION }}
@@ -480,7 +480,7 @@ jobs:
480480
env:
481481
NIGHTLY_CHANNEL: nightly
482482
steps:
483-
- uses: actions/checkout@v6.0.2
483+
- uses: actions/checkout@v6
484484

485485
- uses: dtolnay/rust-toolchain@master
486486
with:
@@ -502,7 +502,7 @@ jobs:
502502
runs-on: ubuntu-latest
503503
timeout-minutes: 30
504504
steps:
505-
- uses: actions/checkout@v6.0.2
505+
- uses: actions/checkout@v6
506506
- uses: dtolnay/rust-toolchain@stable
507507

508508
- uses: Swatinem/rust-cache@v2
@@ -565,7 +565,7 @@ jobs:
565565
runs-on: ubuntu-latest
566566
timeout-minutes: 30
567567
steps:
568-
- uses: actions/checkout@v6.0.2
568+
- uses: actions/checkout@v6
569569
- uses: dtolnay/rust-toolchain@stable
570570
with:
571571
target: wasm32-wasip1

‎.github/workflows/cron-ci.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# Disable this scheduled job when running on a fork.
2525
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
2626
steps:
27-
- uses: actions/checkout@v6.0.2
27+
- uses: actions/checkout@v6
2828
- uses: dtolnay/rust-toolchain@stable
2929
- uses: taiki-e/install-action@cargo-llvm-cov
3030
- uses: actions/setup-python@v6.2.0
@@ -53,7 +53,7 @@ jobs:
5353
# Disable this scheduled job when running on a fork.
5454
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
5555
steps:
56-
- uses: actions/checkout@v6.0.2
56+
- uses: actions/checkout@v6
5757
- uses: dtolnay/rust-toolchain@stable
5858
- name: build rustpython
5959
run: cargo build --release --verbose
@@ -85,7 +85,7 @@ jobs:
8585
# Disable this scheduled job when running on a fork.
8686
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
8787
steps:
88-
- uses: actions/checkout@v6.0.2
88+
- uses: actions/checkout@v6
8989
- uses: dtolnay/rust-toolchain@stable
9090
- uses: actions/setup-python@v6.2.0
9191
with:
@@ -143,7 +143,7 @@ jobs:
143143
# Disable this scheduled job when running on a fork.
144144
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
145145
steps:
146-
- uses: actions/checkout@v6.0.2
146+
- uses: actions/checkout@v6
147147
- uses: dtolnay/rust-toolchain@stable
148148
- uses: actions/setup-python@v6.2.0
149149
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 10
2222
steps:
2323
- name: Checkout base branch
24-
uses: actions/checkout@v6.0.2
24+
uses: actions/checkout@v6
2525
with:
2626
# Use base branch for scripts (security: don't run PR code with elevated permissions)
2727
ref: ${{ github.event.pull_request.base.ref }}

‎.github/workflows/pr-format.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
timeout-minutes: 60
2323
steps:
2424
- name: Checkout PR branch
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626

2727
- name: Setup Rust
2828
uses: dtolnay/rust-toolchain@stable

‎.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@v6.0.2
55+
- uses: actions/checkout@v6
5656
- uses: dtolnay/rust-toolchain@stable
5757
- uses: cargo-bins/cargo-binstall@main
5858

@@ -88,7 +88,7 @@ jobs:
8888
# Disable this scheduled job when running on a fork.
8989
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
9090
steps:
91-
- uses: actions/checkout@v6.0.2
91+
- uses: actions/checkout@v6
9292
- uses: dtolnay/rust-toolchain@stable
9393
with:
9494
targets: wasm32-wasip1
@@ -139,7 +139,7 @@ jobs:
139139
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
140140
needs: [build, build-wasm]
141141
steps:
142-
- uses: actions/checkout@v6.0.2
142+
- uses: actions/checkout@v6
143143

144144
- name: Download Binary Artifacts
145145
uses: actions/download-artifact@v8.0.0

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

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

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ opt-level = 3
101101
lto = "thin"
102102

103103
[patch.crates-io]
104+
parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
104105
# REDOX START, Uncomment when you want to compile/check with redoxer
105106
# REDOX END
106107

‎Lib/test/_test_multiprocessing.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ def _acquire_release(lock, timeout, l=None, n=1):
14591459
for _ in range(n):
14601460
lock.release()
14611461

1462-
@unittest.skip("TODO: RUSTPYTHON; flaky timeout")
1462+
@unittest.skip("TODO: RUSTPYTHON; flaky timeout - thread start latency")
14631463
def test_repr_rlock(self):
14641464
if self.TYPE != 'processes':
14651465
self.skipTest('test not appropriate for {}'.format(self.TYPE))
@@ -4415,7 +4415,6 @@ def test_shared_memory_across_processes(self):
44154415

44164416
sms.close()
44174417

4418-
@unittest.skip("TODO: RUSTPYTHON; flaky")
44194418
@unittest.skipIf(os.name != "posix", "not feasible in non-posix platforms")
44204419
def test_shared_memory_SharedMemoryServer_ignores_sigint(self):
44214420
# bpo-36368: protect SharedMemoryManager server process from
@@ -4440,7 +4439,6 @@ def test_shared_memory_SharedMemoryServer_ignores_sigint(self):
44404439

44414440
smm.shutdown()
44424441

4443-
@unittest.skip("TODO: RUSTPYTHON: sem_unlink cleanup race causes spurious stderr output")
44444442
@unittest.skipIf(os.name != "posix", "resource_tracker is posix only")
44454443
@resource_tracker_format_subtests
44464444
def test_shared_memory_SharedMemoryManager_reuses_resource_tracker(self):

0 commit comments

Comments
 (0)