Update hylang

[yosifkit]

👋 bye pypy 3.9

Changes:

• hylang/docker-hylang@72b605d: Add back Windows variants 🚀
• hylang/docker-hylang@5e78df9: Adjust ordering to make Windows exclusion more obvious/clear
• hylang/docker-hylang@5097255: Make Alpine 3.20 the default for Alpine variants
• hylang/docker-hylang@fb043ad: Actually remove pypy3.9

[tianon]

Wait no more Windows at all? I guess that probably tracks. 🤔

[tianon]

Wait no more Windows at all? I guess that probably tracks. 🤔

Oh, due to hylang/hy#2114, but likely fixed by hylang/hy#2115 😭

[tianon]

Tested, verified, re-enabled! 😄

[github-actions]

Diff for cbc5ae2:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6c40236..d158e43 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,43 +1,34 @@
 Maintainers: Paul Tagliamonte <paultag@hylang.org> (@paultag), Hy Docker Team (@hylang/docker)
 GitRepo: https://github.com/hylang/docker-hylang.git
-GitCommit: cc3a452953d734499bb98275a0a71a3f41895112
+GitCommit: 72b605d4755c0e13098e59442882ee8e6a708227
 Directory: dockerfiles-generated
 
-Tags: 0.29.0-pypy3.9-bookworm, 0.29-pypy3.9-bookworm, 0-pypy3.9-bookworm, pypy3.9-bookworm
-SharedTags: 0.29.0-pypy3.9, 0.29-pypy3.9, 0-pypy3.9, pypy3.9
+Tags: 0.29.0-pypy3.10-bookworm, 0.29-pypy3.10-bookworm, 0-pypy3.10-bookworm, pypy3.10-bookworm, 0.29.0-pypy-bookworm, 0.29-pypy-bookworm, 0-pypy-bookworm, pypy-bookworm
+SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
 Architectures: amd64, arm64v8, i386
-File: Dockerfile.pypy3.9-bookworm
+File: Dockerfile.pypy3.10-bookworm
 
-Tags: 0.29.0-pypy3.9-bullseye, 0.29-pypy3.9-bullseye, 0-pypy3.9-bullseye, pypy3.9-bullseye
+Tags: 0.29.0-pypy3.10-bullseye, 0.29-pypy3.10-bullseye, 0-pypy3.10-bullseye, pypy3.10-bullseye, 0.29.0-pypy-bullseye, 0.29-pypy-bullseye, 0-pypy-bullseye, pypy-bullseye
 Architectures: amd64, arm64v8, i386
-File: Dockerfile.pypy3.9-bullseye
+File: Dockerfile.pypy3.10-bullseye
 
-Tags: 0.29.0-pypy3.9-windowsservercore-1809, 0.29-pypy3.9-windowsservercore-1809, 0-pypy3.9-windowsservercore-1809, pypy3.9-windowsservercore-1809
-SharedTags: 0.29.0-pypy3.9, 0.29-pypy3.9, 0-pypy3.9, pypy3.9
+Tags: 0.29.0-pypy3.10-windowsservercore-1809, 0.29-pypy3.10-windowsservercore-1809, 0-pypy3.10-windowsservercore-1809, pypy3.10-windowsservercore-1809, 0.29.0-pypy-windowsservercore-1809, 0.29-pypy-windowsservercore-1809, 0-pypy-windowsservercore-1809, pypy-windowsservercore-1809
+SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
 Architectures: windows-amd64
-File: Dockerfile.pypy3.9-windowsservercore-1809
+File: Dockerfile.pypy3.10-windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 0.29.0-pypy3.9-windowsservercore-ltsc2022, 0.29-pypy3.9-windowsservercore-ltsc2022, 0-pypy3.9-windowsservercore-ltsc2022, pypy3.9-windowsservercore-ltsc2022
-SharedTags: 0.29.0-pypy3.9, 0.29-pypy3.9, 0-pypy3.9, pypy3.9
+Tags: 0.29.0-pypy3.10-windowsservercore-ltsc2022, 0.29-pypy3.10-windowsservercore-ltsc2022, 0-pypy3.10-windowsservercore-ltsc2022, pypy3.10-windowsservercore-ltsc2022, 0.29.0-pypy-windowsservercore-ltsc2022, 0.29-pypy-windowsservercore-ltsc2022, 0-pypy-windowsservercore-ltsc2022, pypy-windowsservercore-ltsc2022
+SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
 Architectures: windows-amd64
-File: Dockerfile.pypy3.9-windowsservercore-ltsc2022
+File: Dockerfile.pypy3.10-windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 0.29.0-pypy3.10-bookworm, 0.29-pypy3.10-bookworm, 0-pypy3.10-bookworm, pypy3.10-bookworm, 0.29.0-pypy-bookworm, 0.29-pypy-bookworm, 0-pypy-bookworm, pypy-bookworm
-SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
-Architectures: amd64, arm64v8, i386
-File: Dockerfile.pypy3.10-bookworm
-
-Tags: 0.29.0-pypy3.10-bullseye, 0.29-pypy3.10-bullseye, 0-pypy3.10-bullseye, pypy3.10-bullseye, 0.29.0-pypy-bullseye, 0.29-pypy-bullseye, 0-pypy-bullseye, pypy-bullseye
-Architectures: amd64, arm64v8, i386
-File: Dockerfile.pypy3.10-bullseye
-
-Tags: 0.29.0-python3.8-alpine3.19, 0.29-python3.8-alpine3.19, 0-python3.8-alpine3.19, python3.8-alpine3.19, 0.29.0-python3.8-alpine, 0.29-python3.8-alpine, 0-python3.8-alpine, python3.8-alpine
+Tags: 0.29.0-python3.8-alpine3.19, 0.29-python3.8-alpine3.19, 0-python3.8-alpine3.19, python3.8-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.8-alpine3.19
 
-Tags: 0.29.0-python3.8-alpine3.20, 0.29-python3.8-alpine3.20, 0-python3.8-alpine3.20, python3.8-alpine3.20
+Tags: 0.29.0-python3.8-alpine3.20, 0.29-python3.8-alpine3.20, 0-python3.8-alpine3.20, python3.8-alpine3.20, 0.29.0-python3.8-alpine, 0.29-python3.8-alpine, 0-python3.8-alpine, python3.8-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 File: Dockerfile.python3.8-alpine3.20
 
@@ -50,11 +41,11 @@ Tags: 0.29.0-python3.8-bullseye, 0.29-python3.8-bullseye, 0-python3.8-bullseye,
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 File: Dockerfile.python3.8-bullseye
 
-Tags: 0.29.0-python3.9-alpine3.19, 0.29-python3.9-alpine3.19, 0-python3.9-alpine3.19, python3.9-alpine3.19, 0.29.0-python3.9-alpine, 0.29-python3.9-alpine, 0-python3.9-alpine, python3.9-alpine
+Tags: 0.29.0-python3.9-alpine3.19, 0.29-python3.9-alpine3.19, 0-python3.9-alpine3.19, python3.9-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.9-alpine3.19
 
-Tags: 0.29.0-python3.9-alpine3.20, 0.29-python3.9-alpine3.20, 0-python3.9-alpine3.20, python3.9-alpine3.20
+Tags: 0.29.0-python3.9-alpine3.20, 0.29-python3.9-alpine3.20, 0-python3.9-alpine3.20, python3.9-alpine3.20, 0.29.0-python3.9-alpine, 0.29-python3.9-alpine, 0-python3.9-alpine, python3.9-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 File: Dockerfile.python3.9-alpine3.20
 
@@ -67,11 +58,11 @@ Tags: 0.29.0-python3.9-bullseye, 0.29-python3.9-bullseye, 0-python3.9-bullseye,
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 File: Dockerfile.python3.9-bullseye
 
-Tags: 0.29.0-python3.10-alpine3.19, 0.29-python3.10-alpine3.19, 0-python3.10-alpine3.19, python3.10-alpine3.19, 0.29.0-python3.10-alpine, 0.29-python3.10-alpine, 0-python3.10-alpine, python3.10-alpine
+Tags: 0.29.0-python3.10-alpine3.19, 0.29-python3.10-alpine3.19, 0-python3.10-alpine3.19, python3.10-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.10-alpine3.19
 
-Tags: 0.29.0-python3.10-alpine3.20, 0.29-python3.10-alpine3.20, 0-python3.10-alpine3.20, python3.10-alpine3.20
+Tags: 0.29.0-python3.10-alpine3.20, 0.29-python3.10-alpine3.20, 0-python3.10-alpine3.20, python3.10-alpine3.20, 0.29.0-python3.10-alpine, 0.29-python3.10-alpine, 0-python3.10-alpine, python3.10-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 File: Dockerfile.python3.10-alpine3.20
 
@@ -84,11 +75,11 @@ Tags: 0.29.0-python3.10-bullseye, 0.29-python3.10-bullseye, 0-python3.10-bullsey
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.10-bullseye
 
-Tags: 0.29.0-python3.11-alpine3.19, 0.29-python3.11-alpine3.19, 0-python3.11-alpine3.19, python3.11-alpine3.19, 0.29.0-python3.11-alpine, 0.29-python3.11-alpine, 0-python3.11-alpine, python3.11-alpine
+Tags: 0.29.0-python3.11-alpine3.19, 0.29-python3.11-alpine3.19, 0-python3.11-alpine3.19, python3.11-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.11-alpine3.19
 
-Tags: 0.29.0-python3.11-alpine3.20, 0.29-python3.11-alpine3.20, 0-python3.11-alpine3.20, python3.11-alpine3.20
+Tags: 0.29.0-python3.11-alpine3.20, 0.29-python3.11-alpine3.20, 0-python3.11-alpine3.20, python3.11-alpine3.20, 0.29.0-python3.11-alpine, 0.29-python3.11-alpine, 0-python3.11-alpine, python3.11-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.11-alpine3.20
 
@@ -101,11 +92,23 @@ Tags: 0.29.0-python3.11-bullseye, 0.29-python3.11-bullseye, 0-python3.11-bullsey
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.11-bullseye
 
-Tags: 0.29.0-python3.12-alpine3.19, 0.29-python3.12-alpine3.19, 0-python3.12-alpine3.19, python3.12-alpine3.19, 0.29.0-alpine3.19, 0.29-alpine3.19, 0-alpine3.19, alpine3.19, 0.29.0-python3.12-alpine, 0.29-python3.12-alpine, 0-python3.12-alpine, python3.12-alpine, 0.29.0-alpine, 0.29-alpine, 0-alpine, alpine
+Tags: 0.29.0-python3.11-windowsservercore-1809, 0.29-python3.11-windowsservercore-1809, 0-python3.11-windowsservercore-1809, python3.11-windowsservercore-1809
+SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
+Architectures: windows-amd64
+File: Dockerfile.python3.11-windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 0.29.0-python3.11-windowsservercore-ltsc2022, 0.29-python3.11-windowsservercore-ltsc2022, 0-python3.11-windowsservercore-ltsc2022, python3.11-windowsservercore-ltsc2022
+SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
+Architectures: windows-amd64
+File: Dockerfile.python3.11-windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
+Tags: 0.29.0-python3.12-alpine3.19, 0.29-python3.12-alpine3.19, 0-python3.12-alpine3.19, python3.12-alpine3.19, 0.29.0-alpine3.19, 0.29-alpine3.19, 0-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.12-alpine3.19
 
-Tags: 0.29.0-python3.12-alpine3.20, 0.29-python3.12-alpine3.20, 0-python3.12-alpine3.20, python3.12-alpine3.20, 0.29.0-alpine3.20, 0.29-alpine3.20, 0-alpine3.20, alpine3.20
+Tags: 0.29.0-python3.12-alpine3.20, 0.29-python3.12-alpine3.20, 0-python3.12-alpine3.20, python3.12-alpine3.20, 0.29.0-alpine3.20, 0.29-alpine3.20, 0-alpine3.20, alpine3.20, 0.29.0-python3.12-alpine, 0.29-python3.12-alpine, 0-python3.12-alpine, python3.12-alpine, 0.29.0-alpine, 0.29-alpine, 0-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.12-alpine3.20
 
@@ -117,3 +120,15 @@ File: Dockerfile.python3.12-bookworm
 Tags: 0.29.0-python3.12-bullseye, 0.29-python3.12-bullseye, 0-python3.12-bullseye, python3.12-bullseye, 0.29.0-bullseye, 0.29-bullseye, 0-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.12-bullseye
+
+Tags: 0.29.0-python3.12-windowsservercore-1809, 0.29-python3.12-windowsservercore-1809, 0-python3.12-windowsservercore-1809, python3.12-windowsservercore-1809, 0.29.0-windowsservercore-1809, 0.29-windowsservercore-1809, 0-windowsservercore-1809, windowsservercore-1809
+SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest
+Architectures: windows-amd64
+File: Dockerfile.python3.12-windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 0.29.0-python3.12-windowsservercore-ltsc2022, 0.29-python3.12-windowsservercore-ltsc2022, 0-python3.12-windowsservercore-ltsc2022, python3.12-windowsservercore-ltsc2022, 0.29.0-windowsservercore-ltsc2022, 0.29-windowsservercore-ltsc2022, 0-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest
+Architectures: windows-amd64
+File: Dockerfile.python3.12-windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 280561e..61bd3fa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,16 +5,15 @@ hylang:0-alpine3.20
 hylang:0-bookworm
 hylang:0-bullseye
 hylang:0-pypy
-hylang:0-pypy3.9
-hylang:0-pypy3.9-bookworm
-hylang:0-pypy3.9-bullseye
-hylang:0-pypy3.9-windowsservercore-1809
-hylang:0-pypy3.9-windowsservercore-ltsc2022
 hylang:0-pypy3.10
 hylang:0-pypy3.10-bookworm
 hylang:0-pypy3.10-bullseye
+hylang:0-pypy3.10-windowsservercore-1809
+hylang:0-pypy3.10-windowsservercore-ltsc2022
 hylang:0-pypy-bookworm
 hylang:0-pypy-bullseye
+hylang:0-pypy-windowsservercore-1809
+hylang:0-pypy-windowsservercore-ltsc2022
 hylang:0-python3.8
 hylang:0-python3.8-alpine
 hylang:0-python3.8-alpine3.19
@@ -39,12 +38,18 @@ hylang:0-python3.11-alpine3.19
 hylang:0-python3.11-alpine3.20
 hylang:0-python3.11-bookworm
 hylang:0-python3.11-bullseye
+hylang:0-python3.11-windowsservercore-1809
+hylang:0-python3.11-windowsservercore-ltsc2022
 hylang:0-python3.12
 hylang:0-python3.12-alpine
 hylang:0-python3.12-alpine3.19
 hylang:0-python3.12-alpine3.20
 hylang:0-python3.12-bookworm
 hylang:0-python3.12-bullseye
+hylang:0-python3.12-windowsservercore-1809
+hylang:0-python3.12-windowsservercore-ltsc2022
+hylang:0-windowsservercore-1809
+hylang:0-windowsservercore-ltsc2022
 hylang:0.29
 hylang:0.29-alpine
 hylang:0.29-alpine3.19
@@ -52,16 +57,15 @@ hylang:0.29-alpine3.20
 hylang:0.29-bookworm
 hylang:0.29-bullseye
 hylang:0.29-pypy
-hylang:0.29-pypy3.9
-hylang:0.29-pypy3.9-bookworm
-hylang:0.29-pypy3.9-bullseye
-hylang:0.29-pypy3.9-windowsservercore-1809
-hylang:0.29-pypy3.9-windowsservercore-ltsc2022
 hylang:0.29-pypy3.10
 hylang:0.29-pypy3.10-bookworm
 hylang:0.29-pypy3.10-bullseye
+hylang:0.29-pypy3.10-windowsservercore-1809
+hylang:0.29-pypy3.10-windowsservercore-ltsc2022
 hylang:0.29-pypy-bookworm
 hylang:0.29-pypy-bullseye
+hylang:0.29-pypy-windowsservercore-1809
+hylang:0.29-pypy-windowsservercore-ltsc2022
 hylang:0.29-python3.8
 hylang:0.29-python3.8-alpine
 hylang:0.29-python3.8-alpine3.19
@@ -86,12 +90,18 @@ hylang:0.29-python3.11-alpine3.19
 hylang:0.29-python3.11-alpine3.20
 hylang:0.29-python3.11-bookworm
 hylang:0.29-python3.11-bullseye
+hylang:0.29-python3.11-windowsservercore-1809
+hylang:0.29-python3.11-windowsservercore-ltsc2022
 hylang:0.29-python3.12
 hylang:0.29-python3.12-alpine
 hylang:0.29-python3.12-alpine3.19
 hylang:0.29-python3.12-alpine3.20
 hylang:0.29-python3.12-bookworm
 hylang:0.29-python3.12-bullseye
+hylang:0.29-python3.12-windowsservercore-1809
+hylang:0.29-python3.12-windowsservercore-ltsc2022
+hylang:0.29-windowsservercore-1809
+hylang:0.29-windowsservercore-ltsc2022
 hylang:0.29.0
 hylang:0.29.0-alpine
 hylang:0.29.0-alpine3.19
@@ -99,16 +109,15 @@ hylang:0.29.0-alpine3.20
 hylang:0.29.0-bookworm
 hylang:0.29.0-bullseye
 hylang:0.29.0-pypy
-hylang:0.29.0-pypy3.9
-hylang:0.29.0-pypy3.9-bookworm
-hylang:0.29.0-pypy3.9-bullseye
-hylang:0.29.0-pypy3.9-windowsservercore-1809
-hylang:0.29.0-pypy3.9-windowsservercore-ltsc2022
 hylang:0.29.0-pypy3.10
 hylang:0.29.0-pypy3.10-bookworm
 hylang:0.29.0-pypy3.10-bullseye
+hylang:0.29.0-pypy3.10-windowsservercore-1809
+hylang:0.29.0-pypy3.10-windowsservercore-ltsc2022
 hylang:0.29.0-pypy-bookworm
 hylang:0.29.0-pypy-bullseye
+hylang:0.29.0-pypy-windowsservercore-1809
+hylang:0.29.0-pypy-windowsservercore-ltsc2022
 hylang:0.29.0-python3.8
 hylang:0.29.0-python3.8-alpine
 hylang:0.29.0-python3.8-alpine3.19
@@ -133,12 +142,18 @@ hylang:0.29.0-python3.11-alpine3.19
 hylang:0.29.0-python3.11-alpine3.20
 hylang:0.29.0-python3.11-bookworm
 hylang:0.29.0-python3.11-bullseye
+hylang:0.29.0-python3.11-windowsservercore-1809
+hylang:0.29.0-python3.11-windowsservercore-ltsc2022
 hylang:0.29.0-python3.12
 hylang:0.29.0-python3.12-alpine
 hylang:0.29.0-python3.12-alpine3.19
 hylang:0.29.0-python3.12-alpine3.20
 hylang:0.29.0-python3.12-bookworm
 hylang:0.29.0-python3.12-bullseye
+hylang:0.29.0-python3.12-windowsservercore-1809
+hylang:0.29.0-python3.12-windowsservercore-ltsc2022
+hylang:0.29.0-windowsservercore-1809
+hylang:0.29.0-windowsservercore-ltsc2022
 hylang:alpine
 hylang:alpine3.19
 hylang:alpine3.20
@@ -146,16 +161,15 @@ hylang:bookworm
 hylang:bullseye
 hylang:latest
 hylang:pypy
-hylang:pypy3.9
-hylang:pypy3.9-bookworm
-hylang:pypy3.9-bullseye
-hylang:pypy3.9-windowsservercore-1809
-hylang:pypy3.9-windowsservercore-ltsc2022
 hylang:pypy3.10
 hylang:pypy3.10-bookworm
 hylang:pypy3.10-bullseye
+hylang:pypy3.10-windowsservercore-1809
+hylang:pypy3.10-windowsservercore-ltsc2022
 hylang:pypy-bookworm
 hylang:pypy-bullseye
+hylang:pypy-windowsservercore-1809
+hylang:pypy-windowsservercore-ltsc2022
 hylang:python3.8
 hylang:python3.8-alpine
 hylang:python3.8-alpine3.19
@@ -180,9 +194,15 @@ hylang:python3.11-alpine3.19
 hylang:python3.11-alpine3.20
 hylang:python3.11-bookworm
 hylang:python3.11-bullseye
+hylang:python3.11-windowsservercore-1809
+hylang:python3.11-windowsservercore-ltsc2022
 hylang:python3.12
 hylang:python3.12-alpine
 hylang:python3.12-alpine3.19
 hylang:python3.12-alpine3.20
 hylang:python3.12-bookworm
 hylang:python3.12-bullseye
+hylang:python3.12-windowsservercore-1809
+hylang:python3.12-windowsservercore-ltsc2022
+hylang:windowsservercore-1809
+hylang:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 025a22b..89b43c8 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,26 +1,28 @@
 hylang:alpine
-hylang:alpine3.20
+hylang:alpine3.19
 hylang:bookworm
 hylang:bullseye
-hylang:pypy3.9-bookworm
-hylang:pypy3.9-bullseye
-hylang:pypy3.9-windowsservercore-1809
-hylang:pypy3.9-windowsservercore-ltsc2022
 hylang:pypy-bookworm
 hylang:pypy-bullseye
+hylang:pypy-windowsservercore-1809
+hylang:pypy-windowsservercore-ltsc2022
 hylang:python3.8-alpine
-hylang:python3.8-alpine3.20
+hylang:python3.8-alpine3.19
 hylang:python3.8-bookworm
 hylang:python3.8-bullseye
 hylang:python3.9-alpine
-hylang:python3.9-alpine3.20
+hylang:python3.9-alpine3.19
 hylang:python3.9-bookworm
 hylang:python3.9-bullseye
 hylang:python3.10-alpine
-hylang:python3.10-alpine3.20
+hylang:python3.10-alpine3.19
 hylang:python3.10-bookworm
 hylang:python3.10-bullseye
 hylang:python3.11-alpine
-hylang:python3.11-alpine3.20
+hylang:python3.11-alpine3.19
 hylang:python3.11-bookworm
 hylang:python3.11-bullseye
+hylang:python3.11-windowsservercore-1809
+hylang:python3.11-windowsservercore-ltsc2022
+hylang:windowsservercore-1809
+hylang:windowsservercore-ltsc2022
diff --git a/hylang_alpine3.20/Dockerfile.python3.12-alpine3.20 b/hylang_alpine/Dockerfile.python3.12-alpine3.20
similarity index 100%
rename from hylang_alpine3.20/Dockerfile.python3.12-alpine3.20
rename to hylang_alpine/Dockerfile.python3.12-alpine3.20
diff --git a/hylang_alpine/Dockerfile.python3.12-alpine3.19 b/hylang_alpine3.19/Dockerfile.python3.12-alpine3.19
similarity index 100%
rename from hylang_alpine/Dockerfile.python3.12-alpine3.19
rename to hylang_alpine3.19/Dockerfile.python3.12-alpine3.19
diff --git a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809 b/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
similarity index 81%
copy from hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
copy to hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
index 3f1bdd0..9dc1af5 100644
--- a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
+++ b/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
@@ -1,4 +1,4 @@
-FROM pypy:3.9-windowsservercore-1809
+FROM pypy:3.10-windowsservercore-1809
 
 ENV HY_VERSION 0.29.0
 ENV HYRULE_VERSION 0.6.0
diff --git a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809 b/hylang_pypy-windowsservercore-ltsc2022/Dockerfile.pypy3.10-windowsservercore-ltsc2022
similarity index 79%
copy from hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
copy to hylang_pypy-windowsservercore-ltsc2022/Dockerfile.pypy3.10-windowsservercore-ltsc2022
index 3f1bdd0..b456e74 100644
--- a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
+++ b/hylang_pypy-windowsservercore-ltsc2022/Dockerfile.pypy3.10-windowsservercore-ltsc2022
@@ -1,4 +1,4 @@
-FROM pypy:3.9-windowsservercore-1809
+FROM pypy:3.10-windowsservercore-ltsc2022
 
 ENV HY_VERSION 0.29.0
 ENV HYRULE_VERSION 0.6.0
diff --git a/hylang_pypy3.9-bookworm/Dockerfile.pypy3.9-bookworm b/hylang_pypy3.9-bookworm/Dockerfile.pypy3.9-bookworm
deleted file mode 100644
index c4e6d40..0000000
diff --git a/hylang_pypy3.9-bullseye/Dockerfile.pypy3.9-bullseye b/hylang_pypy3.9-bullseye/Dockerfile.pypy3.9-bullseye
deleted file mode 100644
index 0d0686f..0000000
diff --git a/hylang_python3.10-alpine3.20/Dockerfile.python3.10-alpine3.20 b/hylang_python3.10-alpine/Dockerfile.python3.10-alpine3.20
similarity index 100%
rename from hylang_python3.10-alpine3.20/Dockerfile.python3.10-alpine3.20
rename to hylang_python3.10-alpine/Dockerfile.python3.10-alpine3.20
diff --git a/hylang_python3.10-alpine/Dockerfile.python3.10-alpine3.19 b/hylang_python3.10-alpine3.19/Dockerfile.python3.10-alpine3.19
similarity index 100%
rename from hylang_python3.10-alpine/Dockerfile.python3.10-alpine3.19
rename to hylang_python3.10-alpine3.19/Dockerfile.python3.10-alpine3.19
diff --git a/hylang_python3.11-alpine3.20/Dockerfile.python3.11-alpine3.20 b/hylang_python3.11-alpine/Dockerfile.python3.11-alpine3.20
similarity index 100%
rename from hylang_python3.11-alpine3.20/Dockerfile.python3.11-alpine3.20
rename to hylang_python3.11-alpine/Dockerfile.python3.11-alpine3.20
diff --git a/hylang_python3.11-alpine/Dockerfile.python3.11-alpine3.19 b/hylang_python3.11-alpine3.19/Dockerfile.python3.11-alpine3.19
similarity index 100%
rename from hylang_python3.11-alpine/Dockerfile.python3.11-alpine3.19
rename to hylang_python3.11-alpine3.19/Dockerfile.python3.11-alpine3.19
diff --git a/hylang_pypy3.9-windowsservercore-ltsc2022/Dockerfile.pypy3.9-windowsservercore-ltsc2022 b/hylang_python3.11-windowsservercore-1809/Dockerfile.python3.11-windowsservercore-1809
similarity index 80%
rename from hylang_pypy3.9-windowsservercore-ltsc2022/Dockerfile.pypy3.9-windowsservercore-ltsc2022
rename to hylang_python3.11-windowsservercore-1809/Dockerfile.python3.11-windowsservercore-1809
index 1579a24..ba0b640 100644
--- a/hylang_pypy3.9-windowsservercore-ltsc2022/Dockerfile.pypy3.9-windowsservercore-ltsc2022
+++ b/hylang_python3.11-windowsservercore-1809/Dockerfile.python3.11-windowsservercore-1809
@@ -1,4 +1,4 @@
-FROM pypy:3.9-windowsservercore-ltsc2022
+FROM python:3.11-windowsservercore-1809
 
 ENV HY_VERSION 0.29.0
 ENV HYRULE_VERSION 0.6.0
diff --git a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809 b/hylang_python3.11-windowsservercore-ltsc2022/Dockerfile.python3.11-windowsservercore-ltsc2022
similarity index 79%
copy from hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
copy to hylang_python3.11-windowsservercore-ltsc2022/Dockerfile.python3.11-windowsservercore-ltsc2022
index 3f1bdd0..c92ee8e 100644
--- a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
+++ b/hylang_python3.11-windowsservercore-ltsc2022/Dockerfile.python3.11-windowsservercore-ltsc2022
@@ -1,4 +1,4 @@
-FROM pypy:3.9-windowsservercore-1809
+FROM python:3.11-windowsservercore-ltsc2022
 
 ENV HY_VERSION 0.29.0
 ENV HYRULE_VERSION 0.6.0
diff --git a/hylang_python3.8-alpine3.20/Dockerfile.python3.8-alpine3.20 b/hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.20
similarity index 100%
rename from hylang_python3.8-alpine3.20/Dockerfile.python3.8-alpine3.20
rename to hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.20
diff --git a/hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.19 b/hylang_python3.8-alpine3.19/Dockerfile.python3.8-alpine3.19
similarity index 100%
rename from hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.19
rename to hylang_python3.8-alpine3.19/Dockerfile.python3.8-alpine3.19
diff --git a/hylang_python3.9-alpine3.20/Dockerfile.python3.9-alpine3.20 b/hylang_python3.9-alpine/Dockerfile.python3.9-alpine3.20
similarity index 100%
rename from hylang_python3.9-alpine3.20/Dockerfile.python3.9-alpine3.20
rename to hylang_python3.9-alpine/Dockerfile.python3.9-alpine3.20
diff --git a/hylang_python3.9-alpine/Dockerfile.python3.9-alpine3.19 b/hylang_python3.9-alpine3.19/Dockerfile.python3.9-alpine3.19
similarity index 100%
rename from hylang_python3.9-alpine/Dockerfile.python3.9-alpine3.19
rename to hylang_python3.9-alpine3.19/Dockerfile.python3.9-alpine3.19
diff --git a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809 b/hylang_windowsservercore-1809/Dockerfile.python3.12-windowsservercore-1809
similarity index 80%
copy from hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
copy to hylang_windowsservercore-1809/Dockerfile.python3.12-windowsservercore-1809
index 3f1bdd0..534d18e 100644
--- a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
+++ b/hylang_windowsservercore-1809/Dockerfile.python3.12-windowsservercore-1809
@@ -1,4 +1,4 @@
-FROM pypy:3.9-windowsservercore-1809
+FROM python:3.12-windowsservercore-1809
 
 ENV HY_VERSION 0.29.0
 ENV HYRULE_VERSION 0.6.0
diff --git a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809 b/hylang_windowsservercore-ltsc2022/Dockerfile.python3.12-windowsservercore-ltsc2022
similarity index 79%
rename from hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
rename to hylang_windowsservercore-ltsc2022/Dockerfile.python3.12-windowsservercore-ltsc2022
index 3f1bdd0..59e242f 100644
--- a/hylang_pypy3.9-windowsservercore-1809/Dockerfile.pypy3.9-windowsservercore-1809
+++ b/hylang_windowsservercore-ltsc2022/Dockerfile.python3.12-windowsservercore-ltsc2022
@@ -1,4 +1,4 @@
-FROM pypy:3.9-windowsservercore-1809
+FROM python:3.12-windowsservercore-ltsc2022
 
 ENV HY_VERSION 0.29.0
 ENV HYRULE_VERSION 0.6.0

Relevant Maintainers:

• hylang: @paultag @hylang/docker

[tianon]

https://github.com/docker-library/official-images/actions/runs/10621263160/job/29442892904?pr=17447#step:9:18 👀 (the hylang tests run on Windows 😄)

	'hylang-hello-world' [3/3]...passed