Commit c2f6da80 authored by Jochen Sprickerhof's avatar Jochen Sprickerhof

New upstream version 0.6.7

parent a2b77e76
0.6.7 (2018-09-24 06:30:00 -0800)
---------------------------------
- Added debian/copyright file to debian package when license file is specified in package.xml. `#470 <https://github.com/ros-infrastructure/bloom/pull/470>`_
- Refactored release command to prepare for GitLab pull request support. `#483 <https://github.com/ros-infrastructure/bloom/pull/483>`_
- Fixed outdated GitHub URL in help text. `#484 <https://github.com/ros-infrastructure/bloom/pull/484>`_
- Added entry to tracks.yaml to store the upstream tag of the last release. `#472 <https://github.com/ros-infrastructure/bloom/pull/472>`_
0.6.6 (2018-06-28 19:44:00 -0800)
---------------------------------
- Updated vendor typesupport injection for ROS 2. `#477 <https://github.com/ros-infrastructure/bloom/pull/477>`_
......
Software License Agreement (BSD License)
Copyright (c) 2013, Willow Garage, Inc.
Copyright (c) 2013-2018, Open Source Robotics Foundation, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
......
......@@ -304,6 +304,9 @@ def execute_track(track, track_dict, release_inc, pretend=True, debug=False, fas
tracks_dict = get_tracks_dict_raw()
tracks_dict['tracks'][track]['release_inc'] = settings['release_inc']
tracks_dict['tracks'][track]['last_version'] = settings['version']
# if release tag is set to ask and a custom value is used
if settings['version'] != settings['release_tag']:
tracks_dict['tracks'][track]['last_release'] = settings['release_tag']
write_tracks_dict_raw(tracks_dict,
'Updating release inc to: ' + str(settings['release_inc']))
......
This diff is collapsed.
......@@ -417,6 +417,20 @@ def generate_substitutions_from_package(
data['debhelper_version'] = 7 if os_version in ['oneiric'] else 9
# Summarize dependencies
summarize_dependency_mapping(data, depends, build_depends, resolved_deps)
# Copyright
licenses = []
separator = '\n' + '=' * 80 + '\n\n'
for l in package.licenses:
if hasattr(l, 'file') and l.file is not None:
license_file = os.path.join(os.path.dirname(package.filename), l.file)
if not os.path.exists(license_file):
error("License file '{}' is not found.".
format(license_file), exit=True)
license_text = open(license_file, 'r').read()
if not license_text.endswith('\n'):
license_text += '\n'
licenses.append(license_text)
data['Copyright'] = separator.join(licenses)
def convertToUnicode(obj):
if sys.version_info.major == 2:
......@@ -471,6 +485,11 @@ def __process_template_folder(path, subs):
os.path.relpath(item),
os.path.relpath(template_path)))
result = em.expand(template, **subs)
# Don't write an empty file
if len(result) == 0 and \
os.path.basename(template_path) in ['copyright']:
processed_items.append(item)
continue
# Write the result
with io.open(template_path, 'w', encoding='utf-8') as f:
if sys.version_info.major == 2:
......
@(Copyright)
\ No newline at end of file
@(Copyright)
\ No newline at end of file
@(Copyright)
\ No newline at end of file
......@@ -4,7 +4,7 @@ import sys
from setuptools import find_packages, setup
install_requires = [
'catkin-pkg >= 0.3.8',
'catkin-pkg >= 0.4.3',
'setuptools',
'empy',
'python-dateutil',
......@@ -22,7 +22,7 @@ if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
setup(
name='bloom',
version='0.6.6',
version='0.6.7',
packages=find_packages(exclude=['test', 'test.*']),
package_data={
'bloom.generators.debian': [
......
[DEFAULT]
Depends: python-yaml, python-empy, python-argparse, python-rosdep (>= 0.10.25), python-rosdistro (>= 0.4.0), python-vcstools (>= 0.1.22), python-setuptools, python-catkin-pkg (>= 0.3.8)
Depends3: python3-yaml, python3-empy, python3-rosdep (>= 0.10.25), python3-rosdistro (>= 0.4.0), python3-vcstools (>= 0.1.22), python3-setuptools, python3-catkin-pkg (>= 0.3.8)
Depends: python-yaml, python-empy, python-argparse, python-rosdep (>= 0.10.25), python-rosdistro (>= 0.4.0), python-vcstools (>= 0.1.22), python-setuptools, python-catkin-pkg (>= 0.4.3)
Depends3: python3-yaml, python3-empy, python3-rosdep (>= 0.10.25), python3-rosdistro (>= 0.4.0), python3-vcstools (>= 0.1.22), python3-setuptools, python3-catkin-pkg (>= 0.4.3)
Conflicts: python3-bloom
Conflicts3: python-bloom
Copyright-File: LICENSE.txt
Suite: oneiric precise quantal raring saucy trusty utopic vivid wily xenial yakkety zesty artful bionic wheezy jessie stretch buster
X-Python3-Version: >= 3.2
......@@ -5,6 +5,7 @@ These system tests are testing the release of groovy+ catkin projects.
from __future__ import print_function
import os
import re
import sys
try:
......@@ -33,7 +34,7 @@ from bloom.commands.git.patch import remove_cmd
from bloom.generators.debian.generator import sanitize_package_name
def create_upstream_repository(packages, directory=None):
def create_upstream_repository(packages, directory=None, format_versions=None):
upstream_dir = 'upstream_repo_groovy'
user('mkdir ' + upstream_dir)
with change_directory(upstream_dir):
......@@ -42,28 +43,34 @@ def create_upstream_repository(packages, directory=None):
user('git add README.md')
user('git commit -m "Initial commit" --allow-empty')
user('git checkout -b groovy_devel')
for package in packages:
if format_versions is None:
format_versions = [1] * len(packages)
for package, format_version in zip(packages, format_versions):
user('mkdir ' + package)
with change_directory(package if len(packages) != 1 else '.'):
package_xml = """\
<?xml version="1.0"?>
<package>
<name>{0}</name>
<package format="{format_version}">
<name>{package}</name>
<version>0.1.0</version>
<description>A catkin (groovy) ROS package called '{0}'</description>
<description>A catkin (groovy) ROS package called '{package}'</description>
<maintainer email="bar@baz.com">Bar</maintainer>
<license>BSD</license>
<license{license_file_attr}>BSD</license>
<url type="bugtracker">https://github.com/ros/this/issues</url>
<url type="repository">https://github.com/ros/this</url>
<build_depend>catkin</build_depend>
{catkin_depend}
<run_depend>catkin</run_depend>
<!-- required for messages generated by gencpp -->
<run_depend>roscpp_core</run_depend>
<{depend_tag}>roscpp_core</{depend_tag}>
</package>
""".format(package)
""".format(package=package,
format_version=format_version,
catkin_depend='<buildtool_depend>catkin</buildtool_depend>'
if format_version > 1 else '<build_depend>catkin</build_depend>\n <run_depend>catkin</run_depend>',
depend_tag='depend' if format_version > 1 else 'run_depend',
license_file_attr=' file="LICENSE"' if format_version > 2 else '')
with open('package.xml', 'w+') as f:
f.write(package_xml)
user('touch .cproject')
......@@ -74,7 +81,8 @@ def create_upstream_repository(packages, directory=None):
os.symlink('../{0}.h'.format(package), 'include/sym/{0}.h'.format(package))
user('mkdir debian')
user('touch debian/something.udev')
user('git add package.xml .cproject .project include debian "white space.txt~"')
user('echo "{0} license" > LICENSE'.format(package))
user('git add package.xml .cproject .project include debian "white space.txt~" LICENSE')
user('git commit -m "Releasing version 0.1.0" --allow-empty')
user('git tag 0.1.0 -m "Releasing version 0.1.0"')
return os.getcwd()
......@@ -204,7 +212,7 @@ def test_multi_package_repository(directory=None):
directory = directory if directory is not None else os.getcwd()
# Setup
pkgs = ['foo', 'bar_ros', 'baz']
upstream_dir = create_upstream_repository(pkgs, directory)
upstream_dir = create_upstream_repository(pkgs, directory, format_versions=[1, 2, 3])
upstream_url = 'file://' + upstream_dir
release_url = create_release_repo(
upstream_url,
......@@ -340,5 +348,17 @@ def test_multi_package_repository(directory=None):
"Extra blank line before Homepage detected."
# Is it the correct package.xml for this pkg?
with open('package.xml', 'r') as f:
assert f.read().count('<name>' + pkg + '</name>'), \
package_xml = f.read()
assert package_xml.count('<name>' + pkg + '</name>'), \
"incorrect package.xml for " + str(pkg)
format_version = int(re.search('format="(\d+)"',
package_xml).group(1))
# Is there a copyright file for this pkg?
if format_version <= 2:
assert not os.path.exists(
os.path.join('debian', 'copyright')), \
"debian/copyright should not be generated"
else:
with open('debian/copyright', 'r') as f:
assert pkg + ' license' in f.read(), \
"debian/copyright does not include right license text"
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