Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pypy #18446

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Update pypy #18446

merged 1 commit into from
Feb 12, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 12, 2025

Changes:

Changes:

- docker-library/pypy@9fc2d9c: Merge pull request docker-library/pypy#87 from infosiftr/default-bookworm
@tianon tianon requested a review from a team as a code owner February 12, 2025 22:45
Copy link

Diff for 3e8edb4:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2d05528..115f80c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,25 +2,25 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/pypy.git
 
 Tags: 2.7-7.3.18-bookworm, 2.7-7.3-bookworm, 2.7-7-bookworm, 2.7-bookworm, 2-7.3.18-bookworm, 2-7.3-bookworm, 2-7-bookworm, 2-bookworm
+SharedTags: 2.7-7.3.18, 2.7-7.3, 2.7-7, 2.7, 2-7.3.18, 2-7.3, 2-7, 2
 Architectures: amd64, arm64v8, i386
 GitCommit: 2251547621d1c4b704aeb2135ca8a8b0a188c02b
 Directory: 2.7/bookworm
 
 Tags: 2.7-7.3.18-bullseye, 2.7-7.3-bullseye, 2.7-7-bullseye, 2.7-bullseye, 2-7.3.18-bullseye, 2-7.3-bullseye, 2-7-bullseye, 2-bullseye
-SharedTags: 2.7-7.3.18, 2.7-7.3, 2.7-7, 2.7, 2-7.3.18, 2-7.3, 2-7, 2
 Architectures: amd64, arm64v8, i386
 GitCommit: 2251547621d1c4b704aeb2135ca8a8b0a188c02b
 Directory: 2.7/bullseye
 
-Tags: 2.7-7.3.18-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.18-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.18-slim-bullseye, 2.7-7.3-slim-bullseye, 2.7-7-slim-bullseye, 2.7-slim-bullseye, 2-7.3.18-slim-bullseye, 2-7.3-slim-bullseye, 2-7-slim-bullseye, 2-slim-bullseye
+Tags: 2.7-7.3.18-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.18-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.18-slim-bookworm, 2.7-7.3-slim-bookworm, 2.7-7-slim-bookworm, 2.7-slim-bookworm, 2-7.3.18-slim-bookworm, 2-7.3-slim-bookworm, 2-7-slim-bookworm, 2-slim-bookworm
 Architectures: amd64, arm64v8, i386
 GitCommit: 2251547621d1c4b704aeb2135ca8a8b0a188c02b
-Directory: 2.7/slim-bullseye
+Directory: 2.7/slim-bookworm
 
-Tags: 2.7-7.3.18-slim-bookworm, 2.7-7.3-slim-bookworm, 2.7-7-slim-bookworm, 2.7-slim-bookworm, 2-7.3.18-slim-bookworm, 2-7.3-slim-bookworm, 2-7-slim-bookworm, 2-slim-bookworm
+Tags: 2.7-7.3.18-slim-bullseye, 2.7-7.3-slim-bullseye, 2.7-7-slim-bullseye, 2.7-slim-bullseye, 2-7.3.18-slim-bullseye, 2-7.3-slim-bullseye, 2-7-slim-bullseye, 2-slim-bullseye
 Architectures: amd64, arm64v8, i386
 GitCommit: 2251547621d1c4b704aeb2135ca8a8b0a188c02b
-Directory: 2.7/slim-bookworm
+Directory: 2.7/slim-bullseye
 
 Tags: 2.7-7.3.18-windowsservercore-1809, 2.7-7.3-windowsservercore-1809, 2.7-7-windowsservercore-1809, 2.7-windowsservercore-1809, 2-7.3.18-windowsservercore-1809, 2-7.3-windowsservercore-1809, 2-7-windowsservercore-1809, 2-windowsservercore-1809
 SharedTags: 2.7-7.3.18, 2.7-7.3, 2.7-7, 2.7, 2-7.3.18, 2-7.3, 2-7, 2, 2.7-7.3.18-windowsservercore, 2.7-7.3-windowsservercore, 2.7-7-windowsservercore, 2.7-windowsservercore, 2-7.3.18-windowsservercore, 2-7.3-windowsservercore, 2-7-windowsservercore, 2-windowsservercore
@@ -44,25 +44,25 @@ Directory: 2.7/windows/windowsservercore-ltsc2025
 Constraints: windowsservercore-ltsc2025
 
 Tags: 3.10-7.3.18-bookworm, 3.10-7.3-bookworm, 3.10-7-bookworm, 3.10-bookworm, 3-7.3.18-bookworm, 3-7.3-bookworm, 3-7-bookworm, 3-bookworm, bookworm
+SharedTags: 3.10-7.3.18, 3.10-7.3, 3.10-7, 3.10, 3-7.3.18, 3-7.3, 3-7, 3, latest
 Architectures: amd64, arm64v8, i386
 GitCommit: fd7662f2fa3596801320489e5880752d7537c65d
 Directory: 3.10/bookworm
 
 Tags: 3.10-7.3.18-bullseye, 3.10-7.3-bullseye, 3.10-7-bullseye, 3.10-bullseye, 3-7.3.18-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
-SharedTags: 3.10-7.3.18, 3.10-7.3, 3.10-7, 3.10, 3-7.3.18, 3-7.3, 3-7, 3, latest
 Architectures: amd64, arm64v8, i386
 GitCommit: fd7662f2fa3596801320489e5880752d7537c65d
 Directory: 3.10/bullseye
 
-Tags: 3.10-7.3.18-slim, 3.10-7.3-slim, 3.10-7-slim, 3.10-slim, 3-7.3.18-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.10-7.3.18-slim-bullseye, 3.10-7.3-slim-bullseye, 3.10-7-slim-bullseye, 3.10-slim-bullseye, 3-7.3.18-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
+Tags: 3.10-7.3.18-slim, 3.10-7.3-slim, 3.10-7-slim, 3.10-slim, 3-7.3.18-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.10-7.3.18-slim-bookworm, 3.10-7.3-slim-bookworm, 3.10-7-slim-bookworm, 3.10-slim-bookworm, 3-7.3.18-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
 Architectures: amd64, arm64v8, i386
 GitCommit: fd7662f2fa3596801320489e5880752d7537c65d
-Directory: 3.10/slim-bullseye
+Directory: 3.10/slim-bookworm
 
-Tags: 3.10-7.3.18-slim-bookworm, 3.10-7.3-slim-bookworm, 3.10-7-slim-bookworm, 3.10-slim-bookworm, 3-7.3.18-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
+Tags: 3.10-7.3.18-slim-bullseye, 3.10-7.3-slim-bullseye, 3.10-7-slim-bullseye, 3.10-slim-bullseye, 3-7.3.18-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm64v8, i386
 GitCommit: fd7662f2fa3596801320489e5880752d7537c65d
-Directory: 3.10/slim-bookworm
+Directory: 3.10/slim-bullseye
 
 Tags: 3.10-7.3.18-windowsservercore-1809, 3.10-7.3-windowsservercore-1809, 3.10-7-windowsservercore-1809, 3.10-windowsservercore-1809, 3-7.3.18-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
 SharedTags: 3.10-7.3.18, 3.10-7.3, 3.10-7, 3.10, 3-7.3.18, 3-7.3, 3-7, 3, latest, 3.10-7.3.18-windowsservercore, 3.10-7.3-windowsservercore, 3.10-7-windowsservercore, 3.10-windowsservercore, 3-7.3.18-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
@@ -86,11 +86,12 @@ Directory: 3.10/windows/windowsservercore-ltsc2025
 Constraints: windowsservercore-ltsc2025
 
 Tags: 3.11-7.3.18-bookworm, 3.11-7.3-bookworm, 3.11-7-bookworm, 3.11-bookworm
+SharedTags: 3.11-7.3.18, 3.11-7.3, 3.11-7, 3.11
 Architectures: amd64, arm64v8, i386
 GitCommit: a1c6fd6d9e1cf36ca056c9d8326019d4c1b39e9a
 Directory: 3.11/bookworm
 
-Tags: 3.11-7.3.18-slim-bookworm, 3.11-7.3-slim-bookworm, 3.11-7-slim-bookworm, 3.11-slim-bookworm
+Tags: 3.11-7.3.18-slim, 3.11-7.3-slim, 3.11-7-slim, 3.11-slim, 3.11-7.3.18-slim-bookworm, 3.11-7.3-slim-bookworm, 3.11-7-slim-bookworm, 3.11-slim-bookworm
 Architectures: amd64, arm64v8, i386
 GitCommit: a1c6fd6d9e1cf36ca056c9d8326019d4c1b39e9a
 Directory: 3.11/slim-bookworm
diff --git a/_bashbrew-list b/_bashbrew-list
index 54f75ac..3106c05 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -161,6 +161,7 @@ pypy:3.10-windowsservercore-ltsc2025
 pypy:3.11
 pypy:3.11-7
 pypy:3.11-7-bookworm
+pypy:3.11-7-slim
 pypy:3.11-7-slim-bookworm
 pypy:3.11-7-windowsservercore
 pypy:3.11-7-windowsservercore-1809
@@ -168,6 +169,7 @@ pypy:3.11-7-windowsservercore-ltsc2022
 pypy:3.11-7-windowsservercore-ltsc2025
 pypy:3.11-7.3
 pypy:3.11-7.3-bookworm
+pypy:3.11-7.3-slim
 pypy:3.11-7.3-slim-bookworm
 pypy:3.11-7.3-windowsservercore
 pypy:3.11-7.3-windowsservercore-1809
@@ -175,12 +177,14 @@ pypy:3.11-7.3-windowsservercore-ltsc2022
 pypy:3.11-7.3-windowsservercore-ltsc2025
 pypy:3.11-7.3.18
 pypy:3.11-7.3.18-bookworm
+pypy:3.11-7.3.18-slim
 pypy:3.11-7.3.18-slim-bookworm
 pypy:3.11-7.3.18-windowsservercore
 pypy:3.11-7.3.18-windowsservercore-1809
 pypy:3.11-7.3.18-windowsservercore-ltsc2022
 pypy:3.11-7.3.18-windowsservercore-ltsc2025
 pypy:3.11-bookworm
+pypy:3.11-slim
 pypy:3.11-slim-bookworm
 pypy:3.11-windowsservercore
 pypy:3.11-windowsservercore-1809

Relevant Maintainers:

@yosifkit
Copy link
Member

Windows ltsc2025 build failures are currently expected (actions/runner-images#11582). It should be fine for our builds since we pin to specific Windows images and can delay moving the 2025 pin until the GitHub runners are ready. This will mean that the Windows 2025 images will not get their "Patch Tuesday" rebuilds until the runner images are updated.

@yosifkit yosifkit merged commit 1afd181 into docker-library:master Feb 12, 2025
22 of 24 checks passed
@yosifkit yosifkit deleted the pypy branch February 12, 2025 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants