Skip to content

Fix packaging deprecation and flake8 regression in tests #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cottsay merged 3 commits into from
Jan 26, 2026
Merged

Fix packaging deprecation and flake8 regression in tests #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7dff57
Fix flake8 warning
MatthijsBurgh Jan 3, 2026
704a54d
fix(test): private member access
MatthijsBurgh Jan 26, 2026
2ebe0a9
Skip the test if using an ancient version of packaging
cottsay Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/spell_check.words
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ findtext
getaffinity
github
https
importorskip
iterdir
kazys
kislyuk
Expand All @@ -28,6 +29,7 @@ lstrip
makefile
makefiles
makeflags
minversion
modline
monkeypatch
msbuild
Expand Down
7 changes: 6 additions & 1 deletion test/test_parse_cmake_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
# Licensed under the Apache License, Version 2.0

from colcon_cmake.task.cmake import _parse_cmake_version_string
import pytest


def test_parse_cmake_version():
# This test requires packaging v17 or newer, but the underlying code
# is more flexible.
pytest.importorskip('packaging', minversion='17')

# Build version prefix string closely matching what cmake version outputs.
base_prefix = 'cmake version '

Expand Down Expand Up @@ -33,7 +38,7 @@ def test_parse_cmake_version():
# Input string was garbage. Assert parsing failed.
assert parsed_version is None
else:
assert parsed_version._version.release[0:3] == expected_version
assert parsed_version.release[0:3] == expected_version
Comment thread
MatthijsBurgh marked this conversation as resolved.


if __name__ == '__main__':
Expand Down
1 change: 0 additions & 1 deletion test/test_spell_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

@pytest.fixture(scope='module')
def known_words():
global spell_check_words_path
return spell_check_words_path.read_text().splitlines()


Expand Down
Loading