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 #14928

Merged
merged 1 commit into from
Jun 24, 2023
Merged

Update pypy #14928

merged 1 commit into from
Jun 24, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 23, 2023

Changes:

Changes:

- docker-library/pypy@b61f2ab: Merge pull request docker-library/pypy#79 from infosiftr/3.10
- docker-library/pypy@c40535e: Add 3.10 (remove 3.8)
@github-actions
Copy link

Diff for fa65aab:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 38e9abf..f75211e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -36,72 +36,72 @@ GitCommit: 7f83ea84de775fa51b6c7c4e66ceafaf14948199
 Directory: 2.7/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 3.8-7.3.11-bookworm, 3.8-7.3-bookworm, 3.8-7-bookworm, 3.8-bookworm
+Tags: 3.9-7.3.12-bookworm, 3.9-7.3-bookworm, 3.9-7-bookworm, 3.9-bookworm
 Architectures: amd64, arm64v8, i386
-GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
-Directory: 3.8/bookworm
+GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
+Directory: 3.9/bookworm
 
-Tags: 3.8-7.3.11-bullseye, 3.8-7.3-bullseye, 3.8-7-bullseye, 3.8-bullseye
-SharedTags: 3.8-7.3.11, 3.8-7.3, 3.8-7, 3.8
+Tags: 3.9-7.3.12-bullseye, 3.9-7.3-bullseye, 3.9-7-bullseye, 3.9-bullseye
+SharedTags: 3.9-7.3.12, 3.9-7.3, 3.9-7, 3.9
 Architectures: amd64, arm64v8, i386
-GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
-Directory: 3.8/bullseye
+GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
+Directory: 3.9/bullseye
 
-Tags: 3.8-7.3.11-slim, 3.8-7.3-slim, 3.8-7-slim, 3.8-slim, 3.8-7.3.11-slim-bullseye, 3.8-7.3-slim-bullseye, 3.8-7-slim-bullseye, 3.8-slim-bullseye
+Tags: 3.9-7.3.12-slim, 3.9-7.3-slim, 3.9-7-slim, 3.9-slim, 3.9-7.3.12-slim-bullseye, 3.9-7.3-slim-bullseye, 3.9-7-slim-bullseye, 3.9-slim-bullseye
 Architectures: amd64, arm64v8, i386
-GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
-Directory: 3.8/slim-bullseye
+GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
+Directory: 3.9/slim-bullseye
 
-Tags: 3.8-7.3.11-slim-bookworm, 3.8-7.3-slim-bookworm, 3.8-7-slim-bookworm, 3.8-slim-bookworm
+Tags: 3.9-7.3.12-slim-bookworm, 3.9-7.3-slim-bookworm, 3.9-7-slim-bookworm, 3.9-slim-bookworm
 Architectures: amd64, arm64v8, i386
-GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
-Directory: 3.8/slim-bookworm
+GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
+Directory: 3.9/slim-bookworm
 
-Tags: 3.8-7.3.11-windowsservercore-1809, 3.8-7.3-windowsservercore-1809, 3.8-7-windowsservercore-1809, 3.8-windowsservercore-1809
-SharedTags: 3.8-7.3.11, 3.8-7.3, 3.8-7, 3.8, 3.8-7.3.11-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore
+Tags: 3.9-7.3.12-windowsservercore-1809, 3.9-7.3-windowsservercore-1809, 3.9-7-windowsservercore-1809, 3.9-windowsservercore-1809
+SharedTags: 3.9-7.3.12, 3.9-7.3, 3.9-7, 3.9, 3.9-7.3.12-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore
 Architectures: windows-amd64
-GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
-Directory: 3.8/windows/windowsservercore-1809
+GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
+Directory: 3.9/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 3.8-7.3.11-windowsservercore-ltsc2022, 3.8-7.3-windowsservercore-ltsc2022, 3.8-7-windowsservercore-ltsc2022, 3.8-windowsservercore-ltsc2022
-SharedTags: 3.8-7.3.11, 3.8-7.3, 3.8-7, 3.8, 3.8-7.3.11-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore
+Tags: 3.9-7.3.12-windowsservercore-ltsc2022, 3.9-7.3-windowsservercore-ltsc2022, 3.9-7-windowsservercore-ltsc2022, 3.9-windowsservercore-ltsc2022
+SharedTags: 3.9-7.3.12, 3.9-7.3, 3.9-7, 3.9, 3.9-7.3.12-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore
 Architectures: windows-amd64
-GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
-Directory: 3.8/windows/windowsservercore-ltsc2022
+GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
+Directory: 3.9/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 3.9-7.3.12-bookworm, 3.9-7.3-bookworm, 3.9-7-bookworm, 3.9-bookworm, 3-7.3.12-bookworm, 3-7.3-bookworm, 3-7-bookworm, 3-bookworm, bookworm
+Tags: 3.10-7.3.12-bookworm, 3.10-7.3-bookworm, 3.10-7-bookworm, 3.10-bookworm, 3-7.3.12-bookworm, 3-7.3-bookworm, 3-7-bookworm, 3-bookworm, bookworm
 Architectures: amd64, arm64v8, i386
-GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
-Directory: 3.9/bookworm
+GitCommit: c40535e566fdd8a081584412826c59e1fa40a256
+Directory: 3.10/bookworm
 
-Tags: 3.9-7.3.12-bullseye, 3.9-7.3-bullseye, 3.9-7-bullseye, 3.9-bullseye, 3-7.3.12-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
-SharedTags: 3.9-7.3.12, 3.9-7.3, 3.9-7, 3.9, 3-7.3.12, 3-7.3, 3-7, 3, latest
+Tags: 3.10-7.3.12-bullseye, 3.10-7.3-bullseye, 3.10-7-bullseye, 3.10-bullseye, 3-7.3.12-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
+SharedTags: 3.10-7.3.12, 3.10-7.3, 3.10-7, 3.10, 3-7.3.12, 3-7.3, 3-7, 3, latest
 Architectures: amd64, arm64v8, i386
-GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
-Directory: 3.9/bullseye
+GitCommit: c40535e566fdd8a081584412826c59e1fa40a256
+Directory: 3.10/bullseye
 
-Tags: 3.9-7.3.12-slim, 3.9-7.3-slim, 3.9-7-slim, 3.9-slim, 3-7.3.12-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.9-7.3.12-slim-bullseye, 3.9-7.3-slim-bullseye, 3.9-7-slim-bullseye, 3.9-slim-bullseye, 3-7.3.12-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
+Tags: 3.10-7.3.12-slim, 3.10-7.3-slim, 3.10-7-slim, 3.10-slim, 3-7.3.12-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.10-7.3.12-slim-bullseye, 3.10-7.3-slim-bullseye, 3.10-7-slim-bullseye, 3.10-slim-bullseye, 3-7.3.12-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm64v8, i386
-GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
-Directory: 3.9/slim-bullseye
+GitCommit: c40535e566fdd8a081584412826c59e1fa40a256
+Directory: 3.10/slim-bullseye
 
-Tags: 3.9-7.3.12-slim-bookworm, 3.9-7.3-slim-bookworm, 3.9-7-slim-bookworm, 3.9-slim-bookworm, 3-7.3.12-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
+Tags: 3.10-7.3.12-slim-bookworm, 3.10-7.3-slim-bookworm, 3.10-7-slim-bookworm, 3.10-slim-bookworm, 3-7.3.12-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
 Architectures: amd64, arm64v8, i386
-GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
-Directory: 3.9/slim-bookworm
+GitCommit: c40535e566fdd8a081584412826c59e1fa40a256
+Directory: 3.10/slim-bookworm
 
-Tags: 3.9-7.3.12-windowsservercore-1809, 3.9-7.3-windowsservercore-1809, 3.9-7-windowsservercore-1809, 3.9-windowsservercore-1809, 3-7.3.12-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
-SharedTags: 3.9-7.3.12, 3.9-7.3, 3.9-7, 3.9, 3-7.3.12, 3-7.3, 3-7, 3, latest, 3.9-7.3.12-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore, 3-7.3.12-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
+Tags: 3.10-7.3.12-windowsservercore-1809, 3.10-7.3-windowsservercore-1809, 3.10-7-windowsservercore-1809, 3.10-windowsservercore-1809, 3-7.3.12-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
+SharedTags: 3.10-7.3.12, 3.10-7.3, 3.10-7, 3.10, 3-7.3.12, 3-7.3, 3-7, 3, latest, 3.10-7.3.12-windowsservercore, 3.10-7.3-windowsservercore, 3.10-7-windowsservercore, 3.10-windowsservercore, 3-7.3.12-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
-Directory: 3.9/windows/windowsservercore-1809
+GitCommit: c40535e566fdd8a081584412826c59e1fa40a256
+Directory: 3.10/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 3.9-7.3.12-windowsservercore-ltsc2022, 3.9-7.3-windowsservercore-ltsc2022, 3.9-7-windowsservercore-ltsc2022, 3.9-windowsservercore-ltsc2022, 3-7.3.12-windowsservercore-ltsc2022, 3-7.3-windowsservercore-ltsc2022, 3-7-windowsservercore-ltsc2022, 3-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 3.9-7.3.12, 3.9-7.3, 3.9-7, 3.9, 3-7.3.12, 3-7.3, 3-7, 3, latest, 3.9-7.3.12-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore, 3-7.3.12-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
+Tags: 3.10-7.3.12-windowsservercore-ltsc2022, 3.10-7.3-windowsservercore-ltsc2022, 3.10-7-windowsservercore-ltsc2022, 3.10-windowsservercore-ltsc2022, 3-7.3.12-windowsservercore-ltsc2022, 3-7.3-windowsservercore-ltsc2022, 3-7-windowsservercore-ltsc2022, 3-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 3.10-7.3.12, 3.10-7.3, 3.10-7, 3.10, 3-7.3.12, 3-7.3, 3-7, 3, latest, 3.10-7.3.12-windowsservercore, 3.10-7.3-windowsservercore, 3.10-7-windowsservercore, 3.10-windowsservercore, 3-7.3.12-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 4a2918a33ab52da23ce6cd3b0754ba54521cf1e0
-Directory: 3.9/windows/windowsservercore-ltsc2022
+GitCommit: c40535e566fdd8a081584412826c59e1fa40a256
+Directory: 3.10/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 3487bda..556f0e6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -106,42 +106,6 @@ pypy:3-slim-bullseye
 pypy:3-windowsservercore
 pypy:3-windowsservercore-1809
 pypy:3-windowsservercore-ltsc2022
-pypy:3.8
-pypy:3.8-7
-pypy:3.8-7-bookworm
-pypy:3.8-7-bullseye
-pypy:3.8-7-slim
-pypy:3.8-7-slim-bookworm
-pypy:3.8-7-slim-bullseye
-pypy:3.8-7-windowsservercore
-pypy:3.8-7-windowsservercore-1809
-pypy:3.8-7-windowsservercore-ltsc2022
-pypy:3.8-7.3
-pypy:3.8-7.3-bookworm
-pypy:3.8-7.3-bullseye
-pypy:3.8-7.3-slim
-pypy:3.8-7.3-slim-bookworm
-pypy:3.8-7.3-slim-bullseye
-pypy:3.8-7.3-windowsservercore
-pypy:3.8-7.3-windowsservercore-1809
-pypy:3.8-7.3-windowsservercore-ltsc2022
-pypy:3.8-7.3.11
-pypy:3.8-7.3.11-bookworm
-pypy:3.8-7.3.11-bullseye
-pypy:3.8-7.3.11-slim
-pypy:3.8-7.3.11-slim-bookworm
-pypy:3.8-7.3.11-slim-bullseye
-pypy:3.8-7.3.11-windowsservercore
-pypy:3.8-7.3.11-windowsservercore-1809
-pypy:3.8-7.3.11-windowsservercore-ltsc2022
-pypy:3.8-bookworm
-pypy:3.8-bullseye
-pypy:3.8-slim
-pypy:3.8-slim-bookworm
-pypy:3.8-slim-bullseye
-pypy:3.8-windowsservercore
-pypy:3.8-windowsservercore-1809
-pypy:3.8-windowsservercore-ltsc2022
 pypy:3.9
 pypy:3.9-7
 pypy:3.9-7-bookworm
@@ -178,6 +142,42 @@ pypy:3.9-slim-bullseye
 pypy:3.9-windowsservercore
 pypy:3.9-windowsservercore-1809
 pypy:3.9-windowsservercore-ltsc2022
+pypy:3.10
+pypy:3.10-7
+pypy:3.10-7-bookworm
+pypy:3.10-7-bullseye
+pypy:3.10-7-slim
+pypy:3.10-7-slim-bookworm
+pypy:3.10-7-slim-bullseye
+pypy:3.10-7-windowsservercore
+pypy:3.10-7-windowsservercore-1809
+pypy:3.10-7-windowsservercore-ltsc2022
+pypy:3.10-7.3
+pypy:3.10-7.3-bookworm
+pypy:3.10-7.3-bullseye
+pypy:3.10-7.3-slim
+pypy:3.10-7.3-slim-bookworm
+pypy:3.10-7.3-slim-bullseye
+pypy:3.10-7.3-windowsservercore
+pypy:3.10-7.3-windowsservercore-1809
+pypy:3.10-7.3-windowsservercore-ltsc2022
+pypy:3.10-7.3.12
+pypy:3.10-7.3.12-bookworm
+pypy:3.10-7.3.12-bullseye
+pypy:3.10-7.3.12-slim
+pypy:3.10-7.3.12-slim-bookworm
+pypy:3.10-7.3.12-slim-bullseye
+pypy:3.10-7.3.12-windowsservercore
+pypy:3.10-7.3.12-windowsservercore-1809
+pypy:3.10-7.3.12-windowsservercore-ltsc2022
+pypy:3.10-bookworm
+pypy:3.10-bullseye
+pypy:3.10-slim
+pypy:3.10-slim-bookworm
+pypy:3.10-slim-bullseye
+pypy:3.10-windowsservercore
+pypy:3.10-windowsservercore-1809
+pypy:3.10-windowsservercore-ltsc2022
 pypy:bookworm
 pypy:bullseye
 pypy:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 8cabd49..765da7a 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,12 +4,12 @@ pypy:2-slim-bullseye
 pypy:2-slim-bookworm
 pypy:2-windowsservercore-1809
 pypy:2-windowsservercore-ltsc2022
-pypy:3.8-bookworm
-pypy:3.8-bullseye
-pypy:3.8-slim-bullseye
-pypy:3.8-slim-bookworm
-pypy:3.8-windowsservercore-1809
-pypy:3.8-windowsservercore-ltsc2022
+pypy:3.9-bookworm
+pypy:3.9-bullseye
+pypy:3.9-slim-bullseye
+pypy:3.9-slim-bookworm
+pypy:3.9-windowsservercore-1809
+pypy:3.9-windowsservercore-ltsc2022
 pypy:bookworm
 pypy:bullseye
 pypy:slim-bullseye
diff --git a/pypy_3.8-bookworm/Dockerfile b/pypy_3.8-bookworm/Dockerfile
deleted file mode 100644
index 00cdb19..0000000
diff --git a/pypy_3.8-bullseye/Dockerfile b/pypy_3.8-bullseye/Dockerfile
deleted file mode 100644
index 81c4895..0000000
diff --git a/pypy_3.8-slim-bookworm/Dockerfile b/pypy_3.8-slim-bookworm/Dockerfile
deleted file mode 100644
index 72d73c3..0000000
diff --git a/pypy_3.8-slim-bullseye/Dockerfile b/pypy_3.8-slim-bullseye/Dockerfile
deleted file mode 100644
index bb5bf94..0000000
diff --git a/pypy_3.8-windowsservercore-1809/Dockerfile b/pypy_3.8-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 6d6268f..0000000
diff --git a/pypy_3.8-windowsservercore-ltsc2022/Dockerfile b/pypy_3.8-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 5ce8015..0000000
diff --git a/pypy_bookworm/Dockerfile b/pypy_3.9-bookworm/Dockerfile
similarity index 100%
copy from pypy_bookworm/Dockerfile
copy to pypy_3.9-bookworm/Dockerfile
diff --git a/pypy_bullseye/Dockerfile b/pypy_3.9-bullseye/Dockerfile
similarity index 100%
copy from pypy_bullseye/Dockerfile
copy to pypy_3.9-bullseye/Dockerfile
diff --git a/pypy_slim-bookworm/Dockerfile b/pypy_3.9-slim-bookworm/Dockerfile
similarity index 100%
copy from pypy_slim-bookworm/Dockerfile
copy to pypy_3.9-slim-bookworm/Dockerfile
diff --git a/pypy_slim-bullseye/Dockerfile b/pypy_3.9-slim-bullseye/Dockerfile
similarity index 100%
copy from pypy_slim-bullseye/Dockerfile
copy to pypy_3.9-slim-bullseye/Dockerfile
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_3.9-windowsservercore-1809/Dockerfile
similarity index 100%
copy from pypy_windowsservercore-1809/Dockerfile
copy to pypy_3.9-windowsservercore-1809/Dockerfile
diff --git a/pypy_windowsservercore-ltsc2022/Dockerfile b/pypy_3.9-windowsservercore-ltsc2022/Dockerfile
similarity index 100%
copy from pypy_windowsservercore-ltsc2022/Dockerfile
copy to pypy_3.9-windowsservercore-ltsc2022/Dockerfile
diff --git a/pypy_bookworm/Dockerfile b/pypy_bookworm/Dockerfile
index d0cb0a6..5870370 100644
--- a/pypy_bookworm/Dockerfile
+++ b/pypy_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.9.17
+# Python 3.10.12
 ENV PYPY_VERSION 7.3.12
 
 RUN set -eux; \
@@ -30,20 +30,20 @@ RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux64.tar.bz2'; \
-			sha256='84c89b966fab2b58f451a482ee30ca7fec3350435bd0b9614615c61dc6da2390'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux64.tar.bz2'; \
+			sha256='6c577993160b6f5ee8cab73cd1a807affcefafe2f7441c87bd926c10505e8731'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-aarch64.tar.bz2'; \
-			sha256='e9327fb9edaf2ad91935d5b8563ec5ff24193bddb175c1acaaf772c025af1824'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-aarch64.tar.bz2'; \
+			sha256='26208b5a134d9860a08f74cce60960005758e82dc5f0e3566a48ed863a1f16a1'; \
 			;; \
 		'i386') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux32.tar.bz2'; \
-			sha256='aa04370d38f451683ccc817d76c2b3e0f471dbb879e0bd618d9affbdc9cd37a4'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux32.tar.bz2'; \
+			sha256='811667825ae58ada4b7c3d8bc1b5055b9f9d6a377e51aedfbe0727966603f60e'; \
 			;; \
 		's390x') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-s390x.tar.bz2'; \
-			sha256='20d84658a6899bdd2ca35b00ead33a2f56cff2c40dce1af630466d27952f6d4f'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-s390x.tar.bz2'; \
+			sha256='043c13a585479428b463ab69575a088db74aadc16798d6e677d97f563585fee3'; \
 			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
@@ -51,7 +51,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.9"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.10"
 		libexpat1 \
 		libncurses5 \
 		libncursesw6 \
@@ -71,7 +71,7 @@ RUN set -eux; \
 # smoke test
 	pypy3 --version; \
 	\
-	cd /opt/pypy/lib/pypy3.9; \
+	cd /opt/pypy/lib/pypy3.10; \
 # 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_bullseye/Dockerfile b/pypy_bullseye/Dockerfile
index 26c3a67..90289f0 100644
--- a/pypy_bullseye/Dockerfile
+++ b/pypy_bullseye/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.9.17
+# Python 3.10.12
 ENV PYPY_VERSION 7.3.12
 
 RUN set -eux; \
@@ -30,20 +30,20 @@ RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux64.tar.bz2'; \
-			sha256='84c89b966fab2b58f451a482ee30ca7fec3350435bd0b9614615c61dc6da2390'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux64.tar.bz2'; \
+			sha256='6c577993160b6f5ee8cab73cd1a807affcefafe2f7441c87bd926c10505e8731'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-aarch64.tar.bz2'; \
-			sha256='e9327fb9edaf2ad91935d5b8563ec5ff24193bddb175c1acaaf772c025af1824'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-aarch64.tar.bz2'; \
+			sha256='26208b5a134d9860a08f74cce60960005758e82dc5f0e3566a48ed863a1f16a1'; \
 			;; \
 		'i386') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux32.tar.bz2'; \
-			sha256='aa04370d38f451683ccc817d76c2b3e0f471dbb879e0bd618d9affbdc9cd37a4'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux32.tar.bz2'; \
+			sha256='811667825ae58ada4b7c3d8bc1b5055b9f9d6a377e51aedfbe0727966603f60e'; \
 			;; \
 		's390x') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-s390x.tar.bz2'; \
-			sha256='20d84658a6899bdd2ca35b00ead33a2f56cff2c40dce1af630466d27952f6d4f'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-s390x.tar.bz2'; \
+			sha256='043c13a585479428b463ab69575a088db74aadc16798d6e677d97f563585fee3'; \
 			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
@@ -51,7 +51,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.9"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.10"
 		libexpat1 \
 		libncurses5 \
 		libncursesw6 \
@@ -71,7 +71,7 @@ RUN set -eux; \
 # smoke test
 	pypy3 --version; \
 	\
-	cd /opt/pypy/lib/pypy3.9; \
+	cd /opt/pypy/lib/pypy3.10; \
 # 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_slim-bookworm/Dockerfile
index c7f840b..d7281bd 100644
--- a/pypy_slim-bookworm/Dockerfile
+++ b/pypy_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.9.17
+# Python 3.10.12
 ENV PYPY_VERSION 7.3.12
 
 RUN set -eux; \
@@ -26,20 +26,20 @@ RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux64.tar.bz2'; \
-			sha256='84c89b966fab2b58f451a482ee30ca7fec3350435bd0b9614615c61dc6da2390'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux64.tar.bz2'; \
+			sha256='6c577993160b6f5ee8cab73cd1a807affcefafe2f7441c87bd926c10505e8731'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-aarch64.tar.bz2'; \
-			sha256='e9327fb9edaf2ad91935d5b8563ec5ff24193bddb175c1acaaf772c025af1824'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-aarch64.tar.bz2'; \
+			sha256='26208b5a134d9860a08f74cce60960005758e82dc5f0e3566a48ed863a1f16a1'; \
 			;; \
 		'i386') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux32.tar.bz2'; \
-			sha256='aa04370d38f451683ccc817d76c2b3e0f471dbb879e0bd618d9affbdc9cd37a4'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux32.tar.bz2'; \
+			sha256='811667825ae58ada4b7c3d8bc1b5055b9f9d6a377e51aedfbe0727966603f60e'; \
 			;; \
 		's390x') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-s390x.tar.bz2'; \
-			sha256='20d84658a6899bdd2ca35b00ead33a2f56cff2c40dce1af630466d27952f6d4f'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-s390x.tar.bz2'; \
+			sha256='043c13a585479428b463ab69575a088db74aadc16798d6e677d97f563585fee3'; \
 			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
@@ -49,7 +49,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.9"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.10"
 		libexpat1 \
 		libncurses5 \
 		libncursesw6 \
@@ -69,7 +69,7 @@ RUN set -eux; \
 # smoke test
 	pypy3 --version; \
 	\
-	cd /opt/pypy/lib/pypy3.9; \
+	cd /opt/pypy/lib/pypy3.10; \
 # 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_slim-bullseye/Dockerfile b/pypy_slim-bullseye/Dockerfile
index bca5107..95c341b 100644
--- a/pypy_slim-bullseye/Dockerfile
+++ b/pypy_slim-bullseye/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.9.17
+# Python 3.10.12
 ENV PYPY_VERSION 7.3.12
 
 RUN set -eux; \
@@ -26,20 +26,20 @@ RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux64.tar.bz2'; \
-			sha256='84c89b966fab2b58f451a482ee30ca7fec3350435bd0b9614615c61dc6da2390'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux64.tar.bz2'; \
+			sha256='6c577993160b6f5ee8cab73cd1a807affcefafe2f7441c87bd926c10505e8731'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-aarch64.tar.bz2'; \
-			sha256='e9327fb9edaf2ad91935d5b8563ec5ff24193bddb175c1acaaf772c025af1824'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-aarch64.tar.bz2'; \
+			sha256='26208b5a134d9860a08f74cce60960005758e82dc5f0e3566a48ed863a1f16a1'; \
 			;; \
 		'i386') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-linux32.tar.bz2'; \
-			sha256='aa04370d38f451683ccc817d76c2b3e0f471dbb879e0bd618d9affbdc9cd37a4'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-linux32.tar.bz2'; \
+			sha256='811667825ae58ada4b7c3d8bc1b5055b9f9d6a377e51aedfbe0727966603f60e'; \
 			;; \
 		's390x') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.12-s390x.tar.bz2'; \
-			sha256='20d84658a6899bdd2ca35b00ead33a2f56cff2c40dce1af630466d27952f6d4f'; \
+			url='https://downloads.python.org/pypy/pypy3.10-v7.3.12-s390x.tar.bz2'; \
+			sha256='043c13a585479428b463ab69575a088db74aadc16798d6e677d97f563585fee3'; \
 			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
@@ -49,7 +49,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.9"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.10"
 		libexpat1 \
 		libncurses5 \
 		libncursesw6 \
@@ -69,7 +69,7 @@ RUN set -eux; \
 # smoke test
 	pypy3 --version; \
 	\
-	cd /opt/pypy/lib/pypy3.9; \
+	cd /opt/pypy/lib/pypy3.10; \
 # 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_windowsservercore-1809/Dockerfile
index cb6f5e1..5a7905a 100644
--- a/pypy_windowsservercore-1809/Dockerfile
+++ b/pypy_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.9.17
+# Python 3.10.12
 ENV PYPY_VERSION 7.3.12
 
-RUN $url = 'https://downloads.python.org/pypy/pypy3.9-v7.3.12-win64.zip'; \
+RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.12-win64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'; \
 	\
-	$sha256 = '0996054207b401aeacace1aa11bad82cfcb463838a1603c5f263626c47bbe0e6'; \
+	$sha256 = '8c3b1d34fb99100e230e94560410a38d450dc844effbee9ea183518e4aff595c'; \
 	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.9-v7.3.12-win64.zip'; \
 	Remove-Item pypy.zip -Force; \
 	\
 	Write-Host 'Renaming ...'; \
-	Rename-Item -Path C:\pypy3.9-v7.3.12-win64 -NewName C:\pypy; \
+	Rename-Item -Path C:\pypy3.10-v7.3.12-win64 -NewName C:\pypy; \
 	\
 	Write-Host 'Verifying install ("pypy --version") ...'; \
 	pypy --version; \
diff --git a/pypy_windowsservercore-ltsc2022/Dockerfile b/pypy_windowsservercore-ltsc2022/Dockerfile
index b099ae2..0fede49 100644
--- a/pypy_windowsservercore-ltsc2022/Dockerfile
+++ b/pypy_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.9.17
+# Python 3.10.12
 ENV PYPY_VERSION 7.3.12
 
-RUN $url = 'https://downloads.python.org/pypy/pypy3.9-v7.3.12-win64.zip'; \
+RUN $url = 'https://downloads.python.org/pypy/pypy3.10-v7.3.12-win64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'; \
 	\
-	$sha256 = '0996054207b401aeacace1aa11bad82cfcb463838a1603c5f263626c47bbe0e6'; \
+	$sha256 = '8c3b1d34fb99100e230e94560410a38d450dc844effbee9ea183518e4aff595c'; \
 	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.9-v7.3.12-win64.zip'; \
 	Remove-Item pypy.zip -Force; \
 	\
 	Write-Host 'Renaming ...'; \
-	Rename-Item -Path C:\pypy3.9-v7.3.12-win64 -NewName C:\pypy; \
+	Rename-Item -Path C:\pypy3.10-v7.3.12-win64 -NewName C:\pypy; \
 	\
 	Write-Host 'Verifying install ("pypy --version") ...'; \
 	pypy --version; \

Relevant Maintainers:

@yosifkit yosifkit merged commit ea7f3f6 into docker-library:master Jun 24, 2023
@yosifkit yosifkit deleted the pypy branch June 24, 2023 00:09
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