Skip to content

Commit ce322b9

Browse files
authored
Revert "Port verify_distribution.py into pythonbuild (#1058)"
This reverts commit db15e1a.
1 parent abce679 commit ce322b9

File tree

11 files changed

+221
-103
lines changed

11 files changed

+221
-103
lines changed

.github/workflows/linux.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,18 @@ jobs:
318318
run: |
319319
chmod +x build/pythonbuild
320320
321-
build/pythonbuild validate-distribution dist/*.tar.zst
322-
323321
if [ "${MATRIX_RUN}" == "true" ]; then
324322
if [ "${MATRIX_LIBC}" == "musl" ]; then
325323
sudo apt install musl-dev
326-
324+
327325
# GitHub's setup-python action sets `LD_LIBRARY_PATH` which overrides `RPATH`
328326
# as used in the musl builds.
329327
unset LD_LIBRARY_PATH
330328
fi
331-
332-
./test-distribution.py dist/*.tar.zst
329+
EXTRA_ARGS="--run"
333330
fi
331+
332+
build/pythonbuild validate-distribution ${EXTRA_ARGS} dist/*.tar.zst
334333
env:
335334
MATRIX_RUN: ${{ matrix.run }}
336335
MATRIX_LIBC: ${{ matrix.libc }}

.github/workflows/macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ jobs:
178178
run: |
179179
chmod +x build/pythonbuild
180180
181-
build/pythonbuild validate-distribution --macos-sdks-path macosx-sdks dist/*.tar.zst
182-
183181
if [ "${MATRIX_RUN}" == "true" ]; then
184-
./test-distribution.py dist/*.tar.zst
182+
EXTRA_ARGS="--run"
185183
fi
184+
185+
build/pythonbuild validate-distribution --macos-sdks-path macosx-sdks ${EXTRA_ARGS} dist/*.tar.zst
186186
env:
187187
MATRIX_RUN: ${{ matrix.run }}

.github/workflows/windows.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,4 @@ jobs:
185185
if: ${{ ! matrix.dry-run }}
186186
run: |
187187
$Dists = Resolve-Path -Path "dist/*.tar.zst" -Relative
188-
.\pythonbuild.exe validate-distribution $Dists
189-
uv run test-distribution.py $Dists
188+
.\pythonbuild.exe validate-distribution --run $Dists

Cargo.lock

Lines changed: 145 additions & 1 deletion
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
@@ -9,6 +9,7 @@ anyhow = "1.0.100"
99
apple-sdk = "0.6.0"
1010
bytes = "1.11.0"
1111
clap = "4.5.52"
12+
duct = "1.1.1"
1213
flate2 = "1.1.5"
1314
futures = "0.3.30"
1415
goblin = "0.10.3"

docs/status.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This repository contains ``test-distribution.py`` script that can be
4141
used to run the Python test harness from a distribution archive.
4242

4343
Here, we track the various known failures when running
44-
``test-distribution.py --stdlib -- /path/to/distribution.tar.zst -u all``.
44+
``test-distribution.py /path/to/distribution.tar.zst -u all``.
4545

4646
``test__locale``
4747
----------------

0 commit comments

Comments
 (0)