Skip to content

use improved Python package identification #77

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

Closed
dirk-thomas wants to merge 1 commit into from
Closed

use improved Python package identification #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 5 additions & 24 deletions colcon_ros/package_identification/ros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
from colcon_core.package_identification import logger
from colcon_core.package_identification \
import PackageIdentificationExtensionPoint
from colcon_core.package_identification.python import get_configuration
from colcon_core.package_identification.python import get_setup_result
from colcon_core.plugin_system import satisfies_version
from colcon_core.plugin_system import SkipExtensionException
from colcon_python_setup_py.package_identification.python_setup_py \
import get_setup_arguments_with_context


# mapping paths to tuples containing the ROS package and its build type
Expand Down Expand Up @@ -104,28 +102,11 @@ def identify(self, desc): # noqa: D102
desc.dependencies['test'].add(DependencyDescriptor(
d.name, metadata=_create_metadata(d)))

# for Python build types ensure that a setup.py file exists
# for Python packages provide the options from the setup.py/cfg files
if build_type == 'ament_python':
setup_cfg = desc.path / 'setup.cfg'
for _ in (1, ):
# try to get information from setup.cfg file
if setup_cfg.is_file():
config = get_configuration(setup_cfg)
name = config.get('metadata', {}).get('name')
if name:
options = config.get('options', {})

def getter(env):
nonlocal options
return options
break
else:
# use information from setup.py file

def getter(env): # noqa: F811
nonlocal desc
return get_setup_arguments_with_context(
str(desc.path / 'setup.py'), env)
def getter(env):
nonlocal setup_py
return get_setup_result(setup_py, env=env)

desc.metadata['get_python_setup_options'] = getter

Expand Down
1 change: 0 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ install_requires =
colcon-core>=0.3.18
# technically not a required dependency but "very common" for ROS 1 users
colcon-pkg-config
colcon-python-setup-py
# technically not a required dependency but "very common" for ROS users
colcon-recursive-crawl
packages = find:
Expand Down