From d8135fe66fb2932a706c73861385cd961c70482c Mon Sep 17 00:00:00 2001 From: Renan Rodrigo Date: Mon, 12 Aug 2024 09:23:42 -0300 Subject: [PATCH] chore: remove mantic references from the codebase Signed-off-by: Renan Rodrigo --- README.md | 1 - requirements.test.txt | 1 - tools/create-gh-release-branches.sh | 1 - uaclient/apt.py | 2 +- uaclient/upgrade_lts_contract.py | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 89a4b7a3aa..80e7da0eb9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ [![Released Bionic Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/bionic?label=Bionic&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/bionic/+source/ubuntu-advantage-tools) [![Released Focal Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/focal?label=Focal&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/focal/+source/ubuntu-advantage-tools) [![Released Jammy Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/jammy?label=Jammy&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/jammy/+source/ubuntu-advantage-tools) -[![Released Mantic Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/mantic?label=Mantic&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/mantic/+source/ubuntu-advantage-tools) [![Released Noble Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/noble?label=Noble&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/noble/+source/ubuntu-advantage-tools) [![Released Oracular Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/oracular?label=Oracular&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/oracular/+source/ubuntu-advantage-tools) diff --git a/requirements.test.txt b/requirements.test.txt index 18b379116b..2483750b76 100644 --- a/requirements.test.txt +++ b/requirements.test.txt @@ -12,6 +12,5 @@ pytest-cov # fixme: This may cause weird behavior in the future, or even break, if # two releases have the same python_version. git+https://git.launchpad.net/ubuntu/+source/python-apt@ubuntu/jammy-updates ; python_version == '3.10' -git+https://git.launchpad.net/ubuntu/+source/python-apt@ubuntu/mantic ; python_version == '3.11' # need to keep an aye to bump this when python-apt is in noble-updates git+https://git.launchpad.net/ubuntu/+source/python-apt@ubuntu/noble ; python_version == '3.12' diff --git a/tools/create-gh-release-branches.sh b/tools/create-gh-release-branches.sh index 24fe5e7021..2daf03a309 100755 --- a/tools/create-gh-release-branches.sh +++ b/tools/create-gh-release-branches.sh @@ -42,7 +42,6 @@ do bionic) version=${PRO_VERSION}~18.04;; focal) version=${PRO_VERSION}~20.04;; jammy) version=${PRO_VERSION}~22.04;; - mantic) version=${PRO_VERSION}~23.10;; noble) version=${PRO_VERSION}~24.04;; esac dch_cmd=(dch -m -v "${version}" -D "${release}" -b "Backport $PRO_VERSION to $release (LP: #${SRU_BUG})") diff --git a/uaclient/apt.py b/uaclient/apt.py index d678e7e6a8..f4960cc68a 100644 --- a/uaclient/apt.py +++ b/uaclient/apt.py @@ -60,7 +60,7 @@ APT_UPDATE_SUCCESS_STAMP_PATH = "/var/lib/apt/periodic/update-success-stamp" -SERIES_NOT_USING_DEB822 = ("xenial", "bionic", "focal", "jammy", "mantic") +SERIES_NOT_USING_DEB822 = ("xenial", "bionic", "focal", "jammy") DEB822_REPO_FILE_CONTENT = """\ # Written by ubuntu-pro-client diff --git a/uaclient/upgrade_lts_contract.py b/uaclient/upgrade_lts_contract.py index 4283083f25..f858f837cf 100755 --- a/uaclient/upgrade_lts_contract.py +++ b/uaclient/upgrade_lts_contract.py @@ -42,8 +42,8 @@ "bionic": "xenial", "focal": "bionic", "jammy": "focal", - "mantic": "lunar", "noble": "jammy", + "oracular": "noble", } LOG = logging.getLogger(util.replace_top_level_logger_name(__name__))