Undo all_dep_types grasping from catkin_pkg.Package__slots__

ros-infrastructure · Apr 13, 2021 · 235131d · 235131d
1 parent cb4b23d
commit 235131d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/rosdep2/lookup.py b/src/rosdep2/lookup.py
@@ -340,7 +340,7 @@ def create_from_rospkg(rospack=None, rosstack=None,
         :param sources_loader: (optional) Override SourcesLoader used
             for managing sources.list data sources.
         :param dependency_types: (optional) List of dependency types.
-            Allowed: "build", "buildtool", "build_export", "run", "test", "exec", "doc"
+            Allowed: {'build', 'buildtool', 'build_export', 'buildtool_export', 'exec', 'test', 'doc'}
         """
         # initialize the loader
         if rospack is None:

diff --git a/src/rosdep2/rospkg_loader.py b/src/rosdep2/rospkg_loader.py
@@ -58,8 +58,7 @@
 
 
 def all_dep_types():
-    # NOTE: 'group' is excluded
-    return {x[:-len('_depends')] for x in catkin_pkg.package.Package.__slots__ if x.endswith('_depends')} - {'group'}
+    return {'build', 'buildtool', 'build_export', 'buildtool_export', 'exec', 'test', 'doc'}
 
 
 class RosPkgLoader(RosdepLoader):

diff --git a/test/test_rosdep_rospkg_loader.py b/test/test_rosdep_rospkg_loader.py
@@ -179,8 +179,3 @@ def test_RosPkgLoader_get_loadable():
     keys = loader.get_loadable_views()
     for s in ['ros', 'empty', 'invalid', 'stack1']:
         assert s in keys
-
-
-def test_rospkg_loader_all_dep_types():
-    from rosdep2.rospkg_loader import all_dep_types
-    assert all_dep_types() == {'build', 'buildtool', 'build_export', 'buildtool_export', 'exec', 'test', 'doc'}, all_dep_types()