Commit 351da70e authored by Jochen Sprickerhof's avatar Jochen Sprickerhof

New upstream version 0.6.5

parent e8dec524
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.6"
# command to install dependencies
install:
- pip install PyYAML argparse rosdep vcstools catkin-pkg python-dateutil setuptools
......
0.6.5 (2018-06-25 07:00:00 -0800)
---------------------------------
- Added injection of vendor typesupport packages into build deps for ROS 2. `#475 <https://github.com/ros-infrastructure/bloom/pull/475>`_
- Updated message wording. `#471 <https://github.com/ros-infrastructure/bloom/pull/471>`_
- Updated tested python versions. `#466 <https://github.com/ros-infrastructure/bloom/pull/466>`_
0.6.4 (2018-03-20 13:15:00 -0800)
---------------------------------
- Fixed use of non-dependency library. `#468 <https://github.com/ros-infrastructure/bloom/pull/468>`_
......
......@@ -347,7 +347,7 @@ def get_repo_uri(repository, distro):
default_distro, default_release = get_most_recent('release', repository)
default_release_repo_url = default_release.url if default_release else "press enter to abort"
if default_distro is not None:
warning("A previous distribution, '{0}', released this repository.".format(default_distro))
warning("A different distribution, '{0}', released this repository.".format(default_distro))
else:
warning("No reasonable default release repository url could be determined from previous releases.")
while True:
......
......@@ -87,12 +87,29 @@ class RosDebianGenerator(DebianGenerator):
)
subs['Package'] = rosify_package_name(subs['Package'], self.rosdistro)
# XXX Add workspace package to runtime and buildtime dependencies for ROS 2 only.
if self.rosdistro in ['r2b2', 'r2b3', 'ardent', 'bouncy'] and \
package.name not in ['ament_cmake_core', 'ament_package', 'ros_workspace']:
workspace_pkg_name = rosify_package_name('ros-workspace', self.rosdistro)
subs['BuildDepends'].append(workspace_pkg_name)
subs['Depends'].append(workspace_pkg_name)
# ROS 2 specific bloom extensions.
# TODO(nuclearsandwich) explore other ways to enable these extensions, reduce their necessity,
# or make them configurable rather than relying on distro names.
if self.rosdistro in ['r2b2', 'r2b3', 'ardent', 'bouncy']:
# Add ros-workspace package as a dependency to any package other
# than ros_workspace and its dependencies.
if package.name not in ['ament_cmake_core', 'ament_package', 'ros_workspace']:
workspace_pkg_name = rosify_package_name('ros-workspace', self.rosdistro)
subs['BuildDepends'].append(workspace_pkg_name)
subs['Depends'].append(workspace_pkg_name)
# Add vendor typesupport packages to build dependencies for rosidl_interface_packages.
if self.rosdistro in ['bouncy'] and \
'rosidl_interface_packages' in [p.name for p in package.member_of_groups]:
ROS2_VENDOR_TYPESUPPORT_PACKAGES = [
'rosidl-typesupport-connext-c',
'rosidl-typesupport-connext-cpp',
'rosidl-typesupport-opensplice-c',
'rosidl-typesupport-opensplice-cpp',
]
subs['BuildDepends'] += [
rosify_package_name(name, self.rosdistro) for name in ROS2_VENDOR_TYPESUPPORT_PACKAGES]
return subs
def generate_branching_arguments(self, package, branch):
......
......@@ -22,7 +22,7 @@ if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
setup(
name='bloom',
version='0.6.4',
version='0.6.5',
packages=find_packages(exclude=['test', 'test.*']),
package_data={
'bloom.generators.debian': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment