Skip to content

Commit

Permalink
Remove Ubuntu 23.04 and 23.10
Browse files Browse the repository at this point in the history
Their packages are removed from https://archive.ubuntu.com/ubuntu/dists/ so
continued support for them is impossible.
  • Loading branch information
bwoodsend committed Dec 3, 2024
1 parent ec3eed2 commit cfa2831
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Debian_ 13 (pre-release)
Fedora_ 37-41, 42 (rawhide)
Manjaro_ rolling
O̶p̶e̶n̶S̶U̶S̶E Redacted due to too many upstream issues
Ubuntu_ 23.04-24.10, 25.04 (rerelease)
Ubuntu_ 24.04-24.10, 25.04 (prerelease)
Void_ rolling
============= ===========================================

Expand Down
2 changes: 0 additions & 2 deletions docs/source/ubuntu.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Basic usage::
The default target Ubuntu version is the latest long term support release.
Other versions 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) or Linux Mint 22
* ``polycotylus ubuntu:24.10`` for Oracular Oriole (interim release)
* ``polycotylus ubuntu:25.04`` for Plucky Puffin (interim pre-release)
Expand Down
4 changes: 1 addition & 3 deletions polycotylus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def machine():
from ._fedora import Fedora, Fedora37, Fedora38, Fedora39, Fedora40, Fedora41, Fedora42
from ._void import Void, VoidGlibc, VoidMusl
from ._debian import Debian, Debian13
from ._ubuntu import Ubuntu, Ubuntu2304, Ubuntu2310, Ubuntu2404, Ubuntu2410, Ubuntu2504
from ._ubuntu import Ubuntu, Ubuntu2404, Ubuntu2410, Ubuntu2504

distributions = {i.name: i for i in (Alpine, Arch, Debian, Fedora, Manjaro, Ubuntu, Void)}
distributions["alpine:3.17"] = Alpine317
Expand All @@ -28,8 +28,6 @@ def machine():
distributions["fedora:40"] = Fedora40
distributions["fedora:41"] = Fedora41
distributions["fedora:42"] = Fedora42
distributions["ubuntu:23.04"] = Ubuntu2304
distributions["ubuntu:23.10"] = Ubuntu2310
distributions["ubuntu:24.04"] = Ubuntu2404
distributions["ubuntu:24.10"] = Ubuntu2410
distributions["ubuntu:25.04"] = Ubuntu2504
Expand Down
2 changes: 1 addition & 1 deletion polycotylus/_completions/polycotylus.fish
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set -l distributions alpine arch debian fedora manjaro 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 fedora:42
set -l ubuntu_variants ubuntu:23.04 ubuntu:23.10 ubuntu:24.04 ubuntu:24.10 ubuntu:25.04
set -l ubuntu_variants ubuntu:24.04 ubuntu:24.10 ubuntu:25.04
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
Expand Down
12 changes: 0 additions & 12 deletions polycotylus/_ubuntu.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,6 @@ def _install_user(self):
return "RUN userdel ubuntu\n" + super()._install_user()


class Ubuntu2304(Ubuntu):
base_image = "ubuntu:23.04"
tag = "23.04"
mirror = _mirror.mirrors["ubuntu2304"]


class Ubuntu2310(Ubuntu):
base_image = "ubuntu:23.10"
tag = "23.10"
mirror = _mirror.mirrors["ubuntu2310"]


Ubuntu2404 = Ubuntu


Expand Down
9 changes: 0 additions & 9 deletions tests/test_ubuntu.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def test_ubrotli():
# Ubuntu's repository layout is different for non amd64 architectures which
# 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.Ubuntu2404(Project.from_root(shared.ubrotli), architecture="arm64"),
polycotylus.Ubuntu2504(Project.from_root(shared.ubrotli), architecture="amd64"),
]:
Expand All @@ -62,14 +61,6 @@ def test_ubrotli():
self.update_artifacts_json(artifacts)

assert json.loads((shared.ubrotli / ".polycotylus/artifacts.json").read_bytes()) == [
{
"distribution": "ubuntu",
"tag": "23.04",
"architecture": "amd64",
"variant": "main",
"path": ".polycotylus/ubuntu/23.04/python3-ubrotli_0.1.0-1_amd64.deb",
"signature_path": None,
},
{
"distribution": "ubuntu",
"tag": "24.04",
Expand Down

0 comments on commit cfa2831

Please sign in to comment.