Skip to content

Fix a regression in recursive dependency enumeration #693

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
Jul 25, 2025
Merged

Fix a regression in recursive dependency enumeration #693

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3cbd38
Fix a regression in recursive dependency enumeration
cottsay May 6, 2025
156adf9
Add test, hide behind a feature flag (for now)
cottsay Jul 24, 2025
c9bc733
Merge branch 'master' into cottsay/recursive-dep-bug
cottsay Jul 24, 2025
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
5 changes: 3 additions & 2 deletions colcon_core/package_descriptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ def get_recursive_dependencies(
:raises AssertionError: if a package lists itself as a dependency
"""
if not isinstance(recursive_categories, Mapping):
recursive_categories = defaultdict(lambda: recursive_categories)
non_map_categories = recursive_categories
recursive_categories = defaultdict(lambda: non_map_categories)
Comment on lines +118 to +119
Copy link
Member

@christophebedard christophebedard Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reading up on lambda captures, you might be able to do this (pardon the line length):

Suggested change
non_map_categories = recursive_categories
recursive_categories = defaultdict(lambda: non_map_categories)
recursive_categories = defaultdict(lambda recursive_categories=recursive_categories: recursive_categories)

but it's not really better than the current solution.

Copy link
Member Author

@cottsay cottsay Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, kind of a horse a piece. It's a tricky behavior - I wish the syntax was cleaner.

# the following variable only exists for faster access within the loop
descriptors_by_name = defaultdict(set)
for d in descriptors:
Expand All @@ -138,7 +139,7 @@ def get_recursive_dependencies(
continue
categories = set()
for category in dep.metadata['categories']:
cats = recursive_categories.get(category)
cats = recursive_categories[category]
if cats is None:
categories = None
break
Expand Down
Loading