Skip to content
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

Jump to bottom

Add 'origin' metadata to ROS dependencies #144

Merged
merged 2 commits into from
Aug 30, 2023
Merged

Add 'origin' metadata to ROS dependencies #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76c187b
Add 'origin' metadata to ROS dependencies
cottsay Jul 28, 2023
5169a6f
Merge branch 'master' into cottsay/dep-types
cottsay Aug 29, 2023
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
14 changes: 11 additions & 3 deletions colcon_ros/package_identification/ros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ def augment_packages( # noqa: D102
if pkg:
pkgs[pkg] = desc

metadata = {
'origin': 'ros',
}

# resolve group members and add them to the descriptor dependencies
for pkg, desc in pkgs.items():
for group_depend in pkg.group_depends:
Expand All @@ -119,8 +123,10 @@ def augment_packages( # noqa: D102
continue
group_depend.extract_group_members(pkgs)
for name in group_depend.members:
desc.dependencies['build'].add(DependencyDescriptor(name))
desc.dependencies['run'].add(DependencyDescriptor(name))
desc.dependencies['build'].add(DependencyDescriptor(
name, metadata=metadata))
desc.dependencies['run'].add(DependencyDescriptor(
name, metadata=metadata))


def get_package_with_build_type(path: str):
Expand Down Expand Up @@ -176,7 +182,9 @@ def _get_build_type(pkg):


def _create_metadata(dependency):
metadata = {}
metadata = {
'origin': 'ros',
}
attributes = (
'version_lte',
'version_lt',
Expand Down
12 changes: 6 additions & 6 deletions test/test_dependency_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_version_contraint_eq():
mock.version_eq = '1.1.1'

metadata = _create_metadata(mock)
assert len(metadata.keys()) == 1
assert len(metadata.keys()) == 2
assert metadata['version_eq'] == '1.1.1'


Expand All @@ -30,7 +30,7 @@ def test_version_contraint_gt():
mock.version_gt = '1.1.2'

metadata = _create_metadata(mock)
assert len(metadata.keys()) == 1
assert len(metadata.keys()) == 2
assert metadata['version_gt'] == '1.1.2'


Expand All @@ -44,7 +44,7 @@ def test_version_contraint_lt():
mock.version_lt = '1.1.5'

metadata = _create_metadata(mock)
assert len(metadata.keys()) == 1
assert len(metadata.keys()) == 2
assert metadata['version_lt'] == '1.1.5'


Expand All @@ -58,7 +58,7 @@ def test_version_contraint_lte():
mock.version_lte = '10.1.3'

metadata = _create_metadata(mock)
assert len(metadata.keys()) == 1
assert len(metadata.keys()) == 2
assert metadata['version_lte'] == '10.1.3'


Expand All @@ -72,7 +72,7 @@ def test_version_contraint_gte():
mock.version_gte = '10.45.5'

metadata = _create_metadata(mock)
assert len(metadata.keys()) == 1
assert len(metadata.keys()) == 2
assert metadata['version_gte'] == '10.45.5'


Expand All @@ -84,4 +84,4 @@ def test_version_constraint_none():
mock.version_lte = None
mock.version_gte = None
metadata = _create_metadata(mock)
assert len(metadata.keys()) == 0
assert len(metadata.keys()) == 1