Update pypy #18439

tianon · 2025-02-12T01:06:30Z

Changes:

docker-library/pypy@6d1cce0: Merge pull request Add the 3.11 beta builds too pypy#86 from infosiftr/3.11
docker-library/pypy@a1c6fd6: Add the 3.11 beta builds too

Changes: - docker-library/pypy@6d1cce0: Merge pull request docker-library/pypy#86 from infosiftr/3.11 - docker-library/pypy@a1c6fd6: Add the 3.11 beta builds too

github-actions · 2025-02-12T01:08:01Z

Diff for 2a00cc7:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index b1d8743..2d05528 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -84,3 +84,34 @@ Architectures: windows-amd64
 GitCommit: fd7662f2fa3596801320489e5880752d7537c65d
 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
+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
+Architectures: amd64, arm64v8, i386
+GitCommit: a1c6fd6d9e1cf36ca056c9d8326019d4c1b39e9a
+Directory: 3.11/slim-bookworm
+
+Tags: 3.11-7.3.18-windowsservercore-1809, 3.11-7.3-windowsservercore-1809, 3.11-7-windowsservercore-1809, 3.11-windowsservercore-1809
+SharedTags: 3.11-7.3.18, 3.11-7.3, 3.11-7, 3.11, 3.11-7.3.18-windowsservercore, 3.11-7.3-windowsservercore, 3.11-7-windowsservercore, 3.11-windowsservercore
+Architectures: windows-amd64
+GitCommit: a1c6fd6d9e1cf36ca056c9d8326019d4c1b39e9a
+Directory: 3.11/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 3.11-7.3.18-windowsservercore-ltsc2022, 3.11-7.3-windowsservercore-ltsc2022, 3.11-7-windowsservercore-ltsc2022, 3.11-windowsservercore-ltsc2022
+SharedTags: 3.11-7.3.18, 3.11-7.3, 3.11-7, 3.11, 3.11-7.3.18-windowsservercore, 3.11-7.3-windowsservercore, 3.11-7-windowsservercore, 3.11-windowsservercore
+Architectures: windows-amd64
+GitCommit: a1c6fd6d9e1cf36ca056c9d8326019d4c1b39e9a
+Directory: 3.11/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
+Tags: 3.11-7.3.18-windowsservercore-ltsc2025, 3.11-7.3-windowsservercore-ltsc2025, 3.11-7-windowsservercore-ltsc2025, 3.11-windowsservercore-ltsc2025
+SharedTags: 3.11-7.3.18, 3.11-7.3, 3.11-7, 3.11, 3.11-7.3.18-windowsservercore, 3.11-7.3-windowsservercore, 3.11-7-windowsservercore, 3.11-windowsservercore
+Architectures: windows-amd64
+GitCommit: a1c6fd6d9e1cf36ca056c9d8326019d4c1b39e9a
+Directory: 3.11/windows/windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 6626940..54f75ac 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -158,6 +158,34 @@ pypy:3.10-windowsservercore
 pypy:3.10-windowsservercore-1809
 pypy:3.10-windowsservercore-ltsc2022
 pypy:3.10-windowsservercore-ltsc2025
+pypy:3.11
+pypy:3.11-7
+pypy:3.11-7-bookworm
+pypy:3.11-7-slim-bookworm
+pypy:3.11-7-windowsservercore
+pypy:3.11-7-windowsservercore-1809
+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-bookworm
+pypy:3.11-7.3-windowsservercore
+pypy:3.11-7.3-windowsservercore-1809
+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-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-bookworm
+pypy:3.11-windowsservercore
+pypy:3.11-windowsservercore-1809
+pypy:3.11-windowsservercore-ltsc2022
+pypy:3.11-windowsservercore-ltsc2025
 pypy:bookworm
 pypy:bullseye
 pypy:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e8dc104..fa22f2a 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -5,6 +5,11 @@ pypy:2-slim-bullseye
 pypy:2-windowsservercore-1809
 pypy:2-windowsservercore-ltsc2022
 pypy:2-windowsservercore-ltsc2025
+pypy:3.11-bookworm
+pypy:3.11-slim-bookworm
+pypy:3.11-windowsservercore-1809
+pypy:3.11-windowsservercore-ltsc2022
+pypy:3.11-windowsservercore-ltsc2025
 pypy:bookworm
 pypy:bullseye
 pypy:slim-bookworm
diff --git a/pypy_bookworm/Dockerfile b/pypy_3.11-bookworm/Dockerfile
similarity index 87%
copy from pypy_bookworm/Dockerfile
copy to pypy_3.11-bookworm/Dockerfile
index 48a2eeb..0602e22 100644
--- a/pypy_bookworm/Dockerfile
+++ b/pypy_3.11-bookworm/Dockerfile
@@ -22,7 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
-# Python 3.10.19
+# Python 3.11.11
 ENV PYPY_VERSION 7.3.18
 
 RUN set -eux; \
@@ -30,16 +30,16 @@ RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://downloads.python.org/pypy/pypy3.10-v7.3.18-linux64.tar.bz2'; \
-			sha256='834ccd4544bb47112a66977add7e47f30619f74061ae990876bcba95d98c27c5'; \
+			url='https://downloads.python.org/pypy/pypy3.11-v7.3.18-linux64.tar.bz2'; \
+			sha256='df5fa534800ff09d990e50ca4fdb02d8a06b9ed948dbcb3a09bea0739ef42de7'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.10-v7.3.18-aarch64.tar.bz2'; \
-			sha256='e843aecd48eb06b625af67891b99e3440313cfb64c6851fc37df1e5572c8ef9e'; \
+			url='https://downloads.python.org/pypy/pypy3.11-v7.3.18-aarch64.tar.bz2'; \
+			sha256='95bc3021cb9be2aa766ecb776c215e97ae8c0dda99dd48840b40b5b87d90bc45'; \
 			;; \
 		'i386') \
-			url='https://downloads.python.org/pypy/pypy3.10-v7.3.18-linux32.tar.bz2'; \
-			sha256='34ef09a481254aad0f22bf09fd7c99efb65ffef4f79f5b4222505f55f8d9c22e'; \
+			url='https://downloads.python.org/pypy/pypy3.11-v7.3.18-linux32.tar.bz2'; \
+			sha256='70357a69cdbf4ce449b5743901fcd36208e0a89eadcfb4d2ebdc9b4711a0612c'; \
 			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
@@ -47,7 +47,7 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.10"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.11"
 		libexpat1 \
 		libncurses5 \
 		libncursesw6 \
@@ -67,7 +67,7 @@ RUN set -eux; \
 # smoke test
 	pypy3 --version; \
 	\
-	cd /opt/pypy/lib/pypy3.10; \
+	cd /opt/pypy/lib/pypy3.11; \
 # on pypy3, rebuild gdbm ffi bits for compatibility with Debian Stretch+
 	if [ -f _gdbm_build.py ]; then \
 		pypy3 _gdbm_build.py; \
diff --git a/pypy_slim-bookworm/Dockerfile b/pypy_3.11-slim-bookworm/Dockerfile
similarity index 88%
copy from pypy_slim-bookworm/Dockerfile
copy to pypy_3.11-slim-bookworm/Dockerfile
index 705e0f5..25d50e5 100644
--- a/pypy_slim-bookworm/Dockerfile
+++ b/pypy_3.11-slim-bookworm/Dockerfile
@@ -18,7 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
-# Python 3.10.19
+# Python 3.11.11
 ENV PYPY_VERSION 7.3.18
 
 RUN set -eux; \
@@ -26,16 +26,16 @@ RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://downloads.python.org/pypy/pypy3.10-v7.3.18-linux64.tar.bz2'; \
-			sha256='834ccd4544bb47112a66977add7e47f30619f74061ae990876bcba95d98c27c5'; \
+			url='https://downloads.python.org/pypy/pypy3.11-v7.3.18-linux64.tar.bz2'; \
+			sha256='df5fa534800ff09d990e50ca4fdb02d8a06b9ed948dbcb3a09bea0739ef42de7'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.10-v7.3.18-aarch64.tar.bz2'; \
-			sha256='e843aecd48eb06b625af67891b99e3440313cfb64c6851fc37df1e5572c8ef9e'; \
+			url='https://downloads.python.org/pypy/pypy3.11-v7.3.18-aarch64.tar.bz2'; \
+			sha256='95bc3021cb9be2aa766ecb776c215e97ae8c0dda99dd48840b40b5b87d90bc45'; \
 			;; \
 		'i386') \
-			url='https://downloads.python.org/pypy/pypy3.10-v7.3.18-linux32.tar.bz2'; \
-			sha256='34ef09a481254aad0f22bf09fd7c99efb65ffef4f79f5b4222505f55f8d9c22e'; \
+			url='https://downloads.python.org/pypy/pypy3.11-v7.3.18-linux32.tar.bz2'; \
+			sha256='70357a69cdbf4ce449b5743901fcd36208e0a89eadcfb4d2ebdc9b4711a0612c'; \
 			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
@@ -45,7 +45,7 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 		bzip2 \
 		wget \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.10"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.11"
 		libexpat1 \
 		libncurses5 \
 		libncursesw6 \
@@ -65,7 +65,7 @@ RUN set -eux; \
 # smoke test
 	pypy3 --version; \
 	\
-	cd /opt/pypy/lib/pypy3.10; \
+	cd /opt/pypy/lib/pypy3.11; \
 # on pypy3, rebuild gdbm ffi bits for compatibility with Debian Stretch+
 	if [ -f _gdbm_build.py ]; then \
 		apt-get install -y --no-install-recommends gcc libc6-dev libgdbm-dev; \
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_3.11-windowsservercore-1809/Dockerfile
similarity index 94%
copy from pypy_windowsservercore-1809/Dockerfile
copy to pypy_3.11-windowsservercore-1809/Dockerfile
index 0e9eab2..4e98a7f 100644
--- a/pypy_windowsservercore-1809/Dockerfile
+++ b/pypy_3.11-windowsservercore-1809/Dockerfile
@@ -44,14 +44,14 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
-# Python 3.10.19
+# Python 3.11.11
 ENV PYPY_VERSION 7.3.18
 
-RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.18-win64.zip'; \
+RUN $url = 'https://downloads.python.org/pypy/pypy3.11-v7.3.18-win64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'; \
 	\
-	$sha256 = 'e7ae89c5d45efcc927425281c870d0ce62cd624628f869cb0a25a0647e39a7be'; \
+	$sha256 = 'ccbea242f623700027e713d845dff5c7f7a5806413bbce229d3dcb88715970fd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash pypy.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
@@ -65,7 +65,7 @@ RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.18-win64.zip'; \
 	Remove-Item pypy.zip -Force; \
 	\
 	Write-Host 'Renaming ...'; \
-	Rename-Item -Path C:\pypy3.10-v7.3.18-win64 -NewName C:\pypy; \
+	Rename-Item -Path C:\pypy3.11-v7.3.18-win64 -NewName C:\pypy; \
 	\
 	Write-Host 'Verifying install ("pypy --version") ...'; \
 	pypy --version; \
diff --git a/pypy_windowsservercore-ltsc2022/Dockerfile b/pypy_3.11-windowsservercore-ltsc2022/Dockerfile
similarity index 94%
copy from pypy_windowsservercore-ltsc2022/Dockerfile
copy to pypy_3.11-windowsservercore-ltsc2022/Dockerfile
index 6752e88..0dace8e 100644
--- a/pypy_windowsservercore-ltsc2022/Dockerfile
+++ b/pypy_3.11-windowsservercore-ltsc2022/Dockerfile
@@ -44,14 +44,14 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
-# Python 3.10.19
+# Python 3.11.11
 ENV PYPY_VERSION 7.3.18
 
-RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.18-win64.zip'; \
+RUN $url = 'https://downloads.python.org/pypy/pypy3.11-v7.3.18-win64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'; \
 	\
-	$sha256 = 'e7ae89c5d45efcc927425281c870d0ce62cd624628f869cb0a25a0647e39a7be'; \
+	$sha256 = 'ccbea242f623700027e713d845dff5c7f7a5806413bbce229d3dcb88715970fd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash pypy.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
@@ -65,7 +65,7 @@ RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.18-win64.zip'; \
 	Remove-Item pypy.zip -Force; \
 	\
 	Write-Host 'Renaming ...'; \
-	Rename-Item -Path C:\pypy3.10-v7.3.18-win64 -NewName C:\pypy; \
+	Rename-Item -Path C:\pypy3.11-v7.3.18-win64 -NewName C:\pypy; \
 	\
 	Write-Host 'Verifying install ("pypy --version") ...'; \
 	pypy --version; \
diff --git a/pypy_windowsservercore-ltsc2025/Dockerfile b/pypy_3.11-windowsservercore-ltsc2025/Dockerfile
similarity index 94%
copy from pypy_windowsservercore-ltsc2025/Dockerfile
copy to pypy_3.11-windowsservercore-ltsc2025/Dockerfile
index d0dde1b..0912405 100644
--- a/pypy_windowsservercore-ltsc2025/Dockerfile
+++ b/pypy_3.11-windowsservercore-ltsc2025/Dockerfile
@@ -44,14 +44,14 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
-# Python 3.10.19
+# Python 3.11.11
 ENV PYPY_VERSION 7.3.18
 
-RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.18-win64.zip'; \
+RUN $url = 'https://downloads.python.org/pypy/pypy3.11-v7.3.18-win64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'; \
 	\
-	$sha256 = 'e7ae89c5d45efcc927425281c870d0ce62cd624628f869cb0a25a0647e39a7be'; \
+	$sha256 = 'ccbea242f623700027e713d845dff5c7f7a5806413bbce229d3dcb88715970fd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash pypy.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
@@ -65,7 +65,7 @@ RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.18-win64.zip'; \
 	Remove-Item pypy.zip -Force; \
 	\
 	Write-Host 'Renaming ...'; \
-	Rename-Item -Path C:\pypy3.10-v7.3.18-win64 -NewName C:\pypy; \
+	Rename-Item -Path C:\pypy3.11-v7.3.18-win64 -NewName C:\pypy; \
 	\
 	Write-Host 'Verifying install ("pypy --version") ...'; \
 	pypy --version; \

Relevant Maintainers:

pypy: @tianon @yosifkit

yosifkit · 2025-02-12T17:31:14Z

#18435 (comment):

The problem is that the windows-2025 runner is too old to run the mcr.microsoft.com/windows/servercore:ltsc2025 image released this week (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.

Update pypy

2a00cc7

Changes: - docker-library/pypy@6d1cce0: Merge pull request docker-library/pypy#86 from infosiftr/3.11 - docker-library/pypy@a1c6fd6: Add the 3.11 beta builds too

tianon requested a review from a team as a code owner February 12, 2025 01:06

github-actions bot added the library/pypy label Feb 12, 2025

yosifkit approved these changes Feb 12, 2025

View reviewed changes

yosifkit merged commit 9ebcd3c into docker-library:master Feb 12, 2025
21 of 24 checks passed

yosifkit deleted the pypy branch February 12, 2025 17:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update pypy #18439

Update pypy #18439

tianon commented Feb 12, 2025

github-actions bot commented Feb 12, 2025

yosifkit commented Feb 12, 2025

Update pypy #18439

Update pypy #18439

Conversation

tianon commented Feb 12, 2025

github-actions bot commented Feb 12, 2025

yosifkit commented Feb 12, 2025