From 645a73bf205a3468d61af703211c6634f9c59c5d Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 14 Oct 2025 11:04:21 -0500 Subject: [PATCH 1/5] Add '+upstream' suffix to published deb version We continue to see interference between the deb packages we publish from the colcon project and efforts to package colcon as part of mainline Debian and Ubuntu. Using a high Debian-Version value mitigated the problems in most cases, but was not sufficient to eliminate all of the conflicts we're currently experiencing. Using a debian version suffix which falls late alphabetically appears to give our packages preference by apt. If a user enables a repository which distributes packages created by the colcon project, it is likely that they wish to use these packages instead of the ones packaged by their platform. --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index f99df13..ed268cf 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -3,4 +3,4 @@ No-Python2: Depends3: python3-colcon-core (>= 0.12.0) Suite: focal jammy noble bookworm trixie X-Python3-Version: >= 3.6 -Debian-Version: 100 +Upstream-Version-Suffix: +upstream From 809212cd88d4c367c270ceba7b57a3946d9ceb9f Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 14 Oct 2025 11:04:53 -0500 Subject: [PATCH 2/5] Stop treating warnings as errors in tests While this may have been well-intended, years of builds have demonstrated that we only really see deprecation warnings in our dependencies and rarely catch anything in colcon packages. We may elect to re-enable this flag in our CI builds, but having it enabled in the package itself only makes it more difficult to maintain colcon packages downstream. --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9ab7503..0ab5c42 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,7 +49,6 @@ test = [tool:pytest] filterwarnings = - error # Suppress deprecation warnings in other packages ignore:lib2to3 package is deprecated::scspell ignore:pkg_resources is deprecated as an API::flake8_import_order From a9efc5a436f547105c0f7f5679b5e9569f41a1d4 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 14 Oct 2025 11:06:05 -0500 Subject: [PATCH 3/5] Switch to SPDX license identifier in setup.cfg --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0ab5c42..73f14e9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,12 +13,11 @@ classifiers = Development Status :: 3 - Alpha Environment :: Plugins Intended Audience :: Developers - License :: OSI Approved :: Apache Software License Operating System :: MacOS Operating System :: POSIX Programming Language :: Python Topic :: Software Development :: Build Tools -license = Apache License, Version 2.0 +license = Apache-2.0 description = Extension for colcon to provide Bash scripts. long_description = file: README.rst keywords = colcon From d3e5185cf52f02de71f74f14b651c83bcde3b10b Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 14 Oct 2025 11:07:06 -0500 Subject: [PATCH 4/5] Add a top-level .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8d315d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/dist/ +/*.egg-info/ +/.coverage +/COLCON_IGNORE +.*.swp +__pycache__/ From 7f850b6eb264e00ace34b9967a6cb6ea2d7ed9a2 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 13 Jan 2026 12:04:33 -0600 Subject: [PATCH 5/5] Update target Ubuntu suites Ubuntu Resolute (26.04) is the next LTS release of Ubuntu. --- publish-python.yaml | 1 + stdeb.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/publish-python.yaml b/publish-python.yaml index bd7c869..326bb66 100644 --- a/publish-python.yaml +++ b/publish-python.yaml @@ -11,5 +11,6 @@ artifacts: - ubuntu:focal - ubuntu:jammy - ubuntu:noble + - ubuntu:resolute - debian:bookworm - debian:trixie diff --git a/stdeb.cfg b/stdeb.cfg index ed268cf..32cf4f9 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [colcon-bash] No-Python2: Depends3: python3-colcon-core (>= 0.12.0) -Suite: focal jammy noble bookworm trixie +Suite: focal jammy noble resolute bookworm trixie X-Python3-Version: >= 3.6 Upstream-Version-Suffix: +upstream