Add Ubuntu 24.10 (pre-release) support

bwoodsend · Jun 8, 2024 · 159f736 · 159f736
1 parent 1411b86
commit 159f736
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/README.rst b/README.rst
@@ -77,7 +77,7 @@ Debian_        13 (pre-release)
 Fedora_        37-40, 41 (rawhide)
 Manjaro_       rolling
 OpenSUSE_      Tumbleweed only (rolling)
-Ubuntu_        23.04-24.04
+Ubuntu_        23.04-24.04, 24.10 (pre-release)
 Void_          rolling
 =============  ============================================
 

diff --git a/docs/source/ubuntu.rst b/docs/source/ubuntu.rst
@@ -21,6 +21,7 @@ Specific versions of Ubuntu can be targeted using:
 * ``polycotylus ubuntu:23.04`` for Lunar Lobster (interim release)
 * ``polycotylus ubuntu:23.10`` for Mantic Minotaur (interim release)
 * ``polycotylus ubuntu:24.04`` for Noble Numbat (long term support, default)
+* ``polycotylus ubuntu:24.10`` for Oracular Oriole (pre-release)
 
 No earlier versions of Ubuntu are supported.
 

diff --git a/polycotylus/__init__.py b/polycotylus/__init__.py
@@ -14,7 +14,7 @@ def machine():
 from ._void import Void, VoidGlibc, VoidMusl
 from ._opensuse import OpenSUSE
 from ._debian import Debian, Debian13
-from ._ubuntu import Ubuntu, Ubuntu2304, Ubuntu2310, Ubuntu2404
+from ._ubuntu import Ubuntu, Ubuntu2304, Ubuntu2310, Ubuntu2404, Ubuntu2410
 
 distributions = {i.name: i for i in (Alpine, Arch, Debian, Fedora, Manjaro, OpenSUSE, Ubuntu, Void)}
 distributions["alpine:3.17"] = Alpine317
@@ -31,5 +31,6 @@ def machine():
 distributions["ubuntu:23.04"] = Ubuntu2304
 distributions["ubuntu:23.10"] = Ubuntu2310
 distributions["ubuntu:24.04"] = Ubuntu2404
+distributions["ubuntu:24.10"] = Ubuntu2410
 distributions["void:glibc"] = VoidGlibc
 distributions["void:musl"] = VoidMusl
diff --git a/polycotylus/_completions/polycotylus.fish b/polycotylus/_completions/polycotylus.fish
@@ -2,7 +2,7 @@ set -l distributions alpine arch debian fedora manjaro opensuse ubuntu void
 set -l alpine_variants alpine:3.17 alpine:3.18 alpine:3.19 alpine:3.20 alpine:edge
 set -l debian_variants debian:13
 set -l fedora_variants fedora:37 fedora:38 fedora:39 fedora:40 fedora:41
-set -l ubuntu_variants ubuntu:23.04 ubuntu:23.10 ubuntu:24.04
+set -l ubuntu_variants ubuntu:23.04 ubuntu:23.10 ubuntu:24.04 ubuntu:24.10
 set -l void_variants void:musl void:glibc
 set -l all_variants $distributions $alpine_variants $debian_variants $fedora_variants $ubuntu_variants $void_variants
 set -l atomic_flags --completion --list-localizations --configure --presubmit-check

diff --git a/polycotylus/_mirror.py b/polycotylus/_mirror.py
@@ -487,6 +487,9 @@ def upstream_url(self):
     base_dir=cache_root / "ubuntu2404",
     install_command=r"sed -i -E 's|http://(.*).ubuntu.com/|http://localhost:8906/\1/|g' /etc/apt/sources.list.d/ubuntu.sources",
 )
+mirrors["ubuntu2410"] = mirrors["ubuntu2404"].with_(
+    base_dir=cache_root / "ubuntu2410",
+)
 
 
 if __name__ == "__main__":

diff --git a/polycotylus/_ubuntu.py b/polycotylus/_ubuntu.py
@@ -35,3 +35,9 @@ class Ubuntu2310(Ubuntu):
 
 
 Ubuntu2404 = Ubuntu
+
+
+class Ubuntu2410(Ubuntu):
+    base_image = "ubuntu:24.10"
+    tag = "24.10"
+    mirror = _mirror.mirrors["ubuntu2410"]
diff --git a/tests/test_ubuntu.py b/tests/test_ubuntu.py
@@ -53,8 +53,8 @@ def test_ubrotli():
     # unfortunately makes it necessary to do an extremely slow qemu platform test.
     for self in [
         polycotylus.Ubuntu2304(Project.from_root(shared.ubrotli), architecture="amd64"),
-        polycotylus.Ubuntu2310(Project.from_root(shared.ubrotli), architecture="arm64"),
-        polycotylus.Ubuntu2404(Project.from_root(shared.ubrotli), architecture="amd64"),
+        polycotylus.Ubuntu2404(Project.from_root(shared.ubrotli), architecture="arm64"),
+        polycotylus.Ubuntu2410(Project.from_root(shared.ubrotli), architecture="amd64"),
     ]:
         self.generate()
         artifacts = self.build()
@@ -72,18 +72,18 @@ def test_ubrotli():
         },
         {
             "distribution": "ubuntu",
-            "tag": "23.10",
+            "tag": "24.04",
             "architecture": "arm64",
             "variant": "main",
-            "path": ".polycotylus/ubuntu/23.10/python3-ubrotli_0.1.0-1_arm64.deb",
+            "path": ".polycotylus/ubuntu/24.04/python3-ubrotli_0.1.0-1_arm64.deb",
             "signature_path": None,
         },
         {
             "distribution": "ubuntu",
-            "tag": "24.04",
+            "tag": "24.10",
             "architecture": "amd64",
             "variant": "main",
-            "path": ".polycotylus/ubuntu/24.04/python3-ubrotli_0.1.0-1_amd64.deb",
+            "path": ".polycotylus/ubuntu/24.10/python3-ubrotli_0.1.0-1_amd64.deb",
             "signature_path": None,
         }
     ]