Skip to content

Sync upstream tag 20260325#4

Merged
Schamper merged 4 commits intomainfrom
sync/20260325
Mar 27, 2026
Merged

Sync upstream tag 20260325#4
Schamper merged 4 commits intomainfrom
sync/20260325

Conversation

@Schamper
Copy link
Copy Markdown
Member

Automated merge of upstream tag 20260325 (3 new upstream commits since 20260324).

zanieb and others added 4 commits March 24, 2026 16:12
…when update is already made (astral-sh#1042)

This caused the following failure when retrying an interrupted release

```
Run just release-upload-mirror \
error: No justfile found
Error: Process completed with exit code 1.
```


https://github.com/astral-sh/python-build-standalone/actions/runs/23459592334/job/68261628113
 
 The logs are incriminating
 
 ```
 + git switch latest-release
Switched to a new branch 'latest-release'
branch 'latest-release' set up to track 'origin/latest-release'.
+ git reset --hard origin/latest-release
HEAD is now at 50d925d set latest release to 20260324
+ cat
+ git diff --quiet
+ echo 'No changes to commit.'
No changes to commit.
```

We failed to return to the `main` branch
…al-sh#1041)

Attempting to resolve release failures

```
     Running `target/release/pythonbuild upload-mirror-distributions --dist dist --datetime 20260324T0736 --tag 20260324 --bucket *** --prefix github/python-build-standalone/releases/download/20260324/`
found all 852 release artifacts
uploading cpython-3.10.20-aarch64-apple-darwin-debug-20260324T0736.tar.zst -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-apple-darwin-debug-full.tar.zst
uploading cpython-3.10.20-aarch64-apple-darwin-install_only-20260324T0736.tar.gz -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-apple-darwin-install_only.tar.gz
uploading cpython-3.10.20-aarch64-apple-darwin-install_only_stripped-20260324T0736.tar.gz -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-apple-darwin-install_only_stripped.tar.gz
uploading cpython-3.10.20-aarch64-apple-darwin-pgo+lto-20260324T0736.tar.zst -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-apple-darwin-pgo+lto-full.tar.zst
uploading cpython-3.10.20-aarch64-unknown-linux-gnu-debug-20260324T0736.tar.zst -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-unknown-linux-gnu-debug-full.tar.zst
uploading cpython-3.10.20-aarch64-unknown-linux-gnu-install_only-20260324T0736.tar.gz -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-unknown-linux-gnu-install_only.tar.gz
uploading cpython-3.10.20-aarch64-unknown-linux-gnu-install_only_stripped-20260324T0736.tar.gz -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
uploading cpython-3.10.20-aarch64-unknown-linux-gnu-pgo+lto-20260324T0736.tar.zst -> s3://***/github/python-build-standalone/releases/download/20260324/cpython-3.10.20+20260324-aarch64-unknown-linux-gnu-pgo+lto-full.tar.zst
Error: dispatch failure

Caused by:
    0: io error
    1: client error (SendRequest)
    2: connection error
    3: Connection reset by peer (os error 104)
error: Recipe `release-upload-mirror` failed with exit code 1
```
astral-sh#1027 upgraded a bunch of dependencies, which somehow broke the AWS
upload in the release pipeline.

This takes the `Cargo.lock` from
`517bea88fe93a259f28e02d13c6c0ef4a682b2d7` then updates it (via `cargo
check`) to match the `Cargo.toml` changes from astral-sh#1027. Consequently, some
package versions are still upgraded, but not the full tree.

This appears to have immediately resolved the AWS upload issue locally.
@Schamper Schamper added the sync Automated upstream sync label Mar 26, 2026
@Schamper Schamper merged commit b801400 into main Mar 27, 2026
73 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sync Automated upstream sync

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants