Commit c968957112ec3627ec0da5950ef27e1e4e91e226 - ros-bloom

+6

-0

CHANGELOG.rst less more

	0	0.11.2 (2022-07-18 14:18:10 -0700)
	1	----------------------------------
	2	- Use inspect.getfullargspec where available. `#682 <https://github.com/ros-infrastructure/bloom/issues/682>`_
	3	- Update index.rst to reflect python3 on Ubuntu. `#673 <https://github.com/ros-infrastructure/bloom/issues/673>`_
	4	- Get non eol distros from rosdistro index. `#670 <https://github.com/ros-infrastructure/bloom/issues/670>`_
	5
0	6	0.11.1 (2022-04-21 12:20:00 -0700)
1	7	----------------------------------
2	8	- Update release suites. `#672 <https://github.com/ros-infrastructure/bloom/issues/672>`_

+3

-2

bloom/config.py less more

55	55
56	56	from bloom.util import execute_command
57	57	from bloom.util import my_copytree
58		from bloom.util import get_distro_list_prompt
	58
	59	from bloom.rosdistro_api import get_non_eol_distros_prompt
59	60
60	61	BLOOM_CONFIG_BRANCH = 'master'
61	62	PLACEHOLDER_FILE = 'CONTENT_MOVED_TO_{0}_BRANCH'.format(BLOOM_CONFIG_BRANCH.upper())

117	118	},
118	119	'ros_distro': {
119	120	'<ROS distro>': "This can be any valid ROS distro, e.g. %s" %
120		get_distro_list_prompt()
	121	get_non_eol_distros_prompt()
121	122	},
122	123	'patches': {
123	124	'<path in bloom branch>': '''\

+2

-2

bloom/generators/debian/generate_cmd.py less more

45	45	from bloom.generators.debian.generator import place_template_files
46	46	from bloom.generators.debian.generator import process_template_files
47	47
48		from bloom.util import get_distro_list_prompt
	48	from bloom.rosdistro_api import get_non_eol_distros_prompt
49	49
50	50	try:
51	51	from rosdep2 import create_default_installer_context

73	73	add = parser.add_argument
74	74	add('--os-name', help='OS name, e.g. ubuntu, debian')
75	75	add('--os-version', help='OS version or codename, e.g. precise, wheezy')
76		add('--ros-distro', help="ROS distro, e.g. %s (used for rosdep)" % get_distro_list_prompt())
	76	add('--ros-distro', help="ROS distro, e.g. %s (used for rosdep)" % get_non_eol_distros_prompt())
77	77	add('-i', '--debian-inc', help="debian increment number", default='0')
78	78	add('--native', action='store_true', help="generate native package")
79	79	return parser

+2

-3

bloom/generators/rosdebian.py less more

44	44	from bloom.logging import info
45	45
46	46	from bloom.rosdistro_api import get_index
47
48		from bloom.util import get_distro_list_prompt
	47	from bloom.rosdistro_api import get_non_eol_distros_prompt
49	48
50	49
51	50	class RosDebianGenerator(DebianGenerator):

56	55	def prepare_arguments(self, parser):
57	56	# Add command line arguments for this generator
58	57	add = parser.add_argument
59		add('rosdistro', help="ROS distro to target (%s, etc.)" % get_distro_list_prompt())
	58	add('rosdistro', help="ROS distro to target (%s, etc.)" % get_non_eol_distros_prompt())
60	59	return DebianGenerator.prepare_arguments(self, parser)
61	60
62	61	def handle_arguments(self, args):

+3

-2

bloom/generators/rosrelease.py less more

8	8	from bloom.packages import get_package_data
9	9
10	10	from bloom.util import execute_command
11		from bloom.util import get_distro_list_prompt
	11
	12	from bloom.rosdistro_api import get_non_eol_distros_prompt
12	13
13	14
14	15	class RosReleaseGenerator(ReleaseGenerator):

24	25	def prepare_arguments(self, parser):
25	26	# Add command line arguments for this generator
26	27	add = parser.add_argument
27		add('rosdistro', help="ROS distro to target (%s, etc.)" % get_distro_list_prompt())
	28	add('rosdistro', help="ROS distro to target (%s, etc.)" % get_non_eol_distros_prompt())
28	29	return ReleaseGenerator.prepare_arguments(self, parser)
29	30
30	31	def handle_arguments(self, args):

+2

-3

bloom/generators/rosrpm.py less more

44	44	from bloom.logging import info
45	45
46	46	from bloom.rosdistro_api import get_index
47
48		from bloom.util import get_distro_list_prompt
	47	from bloom.rosdistro_api import get_non_eol_distros_prompt
49	48
50	49
51	50	class RosRpmGenerator(RpmGenerator):

56	55	def prepare_arguments(self, parser):
57	56	# Add command line arguments for this generator
58	57	add = parser.add_argument
59		add('rosdistro', help="ROS distro to target (%s, etc.)" % get_distro_list_prompt())
	58	add('rosdistro', help="ROS distro to target (%s, etc.)" % get_non_eol_distros_prompt())
60	59	return RpmGenerator.prepare_arguments(self, parser)
61	60
62	61	def handle_arguments(self, args):

+2

-2

bloom/generators/rpm/generate_cmd.py less more

45	45	from bloom.generators.rpm.generator import place_template_files
46	46	from bloom.generators.rpm.generator import process_template_files
47	47
48		from bloom.util import get_distro_list_prompt
	48	from bloom.rosdistro_api import get_non_eol_distros_prompt
49	49
50	50	try:
51	51	from rosdep2 import create_default_installer_context

73	73	add = parser.add_argument
74	74	add('--os-name', help='OS name, e.g. fedora, rhel')
75	75	add('--os-version', help='OS version or codename, e.g. heisenbug, santiago')
76		add('--ros-distro', help="ROS distro, e.g. %s (used for rosdep)" % get_distro_list_prompt())
	76	add('--ros-distro', help="ROS distro, e.g. %s (used for rosdep)" % get_non_eol_distros_prompt())
77	77	return parser
78	78
79	79

+9

-0

bloom/rosdistro_api.py less more

183	183
184	184	def get_rosdistro_index_original_branch():
185	185	return _rosdistro_index_original_branch
	186
	187
	188	def get_non_eol_distros_prompt():
	189	non_eol_distros = []
	190	rosdistro_index = get_index()
	191	for name, info in rosdistro_index.distributions.items():
	192	if info.get('distribution_status') != 'end-of-life':
	193	non_eol_distros.append(name)
	194	return ', '.join(non_eol_distros)

+0

-11

bloom/util.py less more

261	261	_quiet = False
262	262	_disable_git_clone = False
263	263	_disable_git_clone_quiet = False
264		_distro_list_prompt = [
265		'indigo',
266		'kinetic',
267		'lunar',
268		'melodic',
269		]
270	264
271	265
272	266	def disable_git_clone(state=True):

290	284	def get_git_clone_state():
291	285	global _disable_git_clone
292	286	return _disable_git_clone
293
294
295		def get_distro_list_prompt():
296		global _distro_list_prompt
297		return ', '.join(_distro_list_prompt)
298	287
299	288
300	289	def get_git_clone_state_quiet():

+1

-1

docs/index.rst less more

31	31
32	32	On Ubuntu the recommended method is to use apt::
33	33
34		$ sudo apt-get install python-bloom
	34	$ sudo apt-get install python3-bloom
35	35
36	36	On other systems you can install bloom via pypi::
37	37

+1

-1

setup.py less more

21	21
22	22	setup(
23	23	name='bloom',
24		version='0.11.1',
	24	version='0.11.2',
25	25	packages=find_packages(exclude=['test', 'test.*']),
26	26	package_data={
27	27	'bloom.generators.debian': [

+4

-1

test/utils/common.py less more

141	141	@functools.wraps(f)
142	142	def decorated(args, *kwds):
143	143	with temporary_directory() as directory:
144		from inspect import getargspec
	144	try:
	145	from inspect import getfullargspec as getargspec
	146	except ImportError:
	147	from inspect import getargspec
145	148	# If it takes directory of kwargs and kwds does already have
146	149	# directory, inject it
147	150	if 'directory' not in kwds and 'directory' in getargspec(f)[0]: