From d0c025da42c805c57c690b96cf86f6f5c140b9c0 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 8 Apr 2025 16:15:49 -0500 Subject: [PATCH 1/5] Drop unnecessary scope qualifiers to please flake8 This variable is not assigned to, and so the scope qualifier is not necessary and may be misleading. --- test/test_spell_check.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_spell_check.py b/test/test_spell_check.py index c36d6ec..725aca5 100644 --- a/test/test_spell_check.py +++ b/test/test_spell_check.py @@ -10,7 +10,6 @@ @pytest.fixture(scope='module') def known_words(): - global spell_check_words_path return spell_check_words_path.read_text().splitlines() From 7a5575d74b5b9a61e74dfe82ec1ccbd0eda4649f 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 496a6d6..3fc4fa1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,7 +51,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 e30931353e66aa2e5e289b34a19daab0e4d3a119 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 3fc4fa1..98d2658 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,13 +13,12 @@ classifiers = Development Status :: 3 - Alpha Environment :: Plugins Intended Audience :: Developers - License :: OSI Approved :: Apache Software License Operating System :: MacOS Operating System :: Microsoft :: Windows 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 read defaults from a config file. long_description = file: README.rst keywords = colcon From 971971530cac32eb3eaee5bd91b190f9a7f53b20 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 db15d0175498604d432354fb3bf297885d90947d 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 9d5fdb8..88aed07 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [colcon-defaults] No-Python2: Depends3: python3-colcon-core (>= 0.12.0), python3-yaml -Suite: focal jammy noble bookworm trixie +Suite: focal jammy noble resolute bookworm trixie X-Python3-Version: >= 3.6 Upstream-Version-Suffix: +upstream