From a04baf85a8eea4eb02168429aa6bfaaeb2effb42 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 23 Jul 2014 15:47:16 +0100 Subject: Modernise packaging, and allow multiple init system installation (based on smoser pastebins). --- setup.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9118e5f6..e27997de 100755 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ class InitsysInstallData(install): user_options = install.user_options + [ # This will magically show up in member variable 'init_sys' ('init-system=', None, - ('init system to configure (%s) [default: None]') % + ('init system(s) to configure (%s) [default: None]') % (", ".join(INITSYS_TYPES)) ), ] @@ -97,13 +97,23 @@ class InitsysInstallData(install): def finalize_options(self): install.finalize_options(self) - if self.init_system and self.init_system not in INITSYS_TYPES: + + if self.init_systems and isinstance(self.init_systems, str): + self.init_systems = self.init_systems.split(",") + + if len(self.init_system) == 0: raise DistutilsArgError(("You must specify one of (%s) when" - " specifying a init system!") % (", ".join(INITSYS_TYPES))) + " specifying init system(s)!") % (", ".join(INITSYS_TYPES))) + + bad = [f for f in self.init_system if f not in INITSYS_TYPES] + if len(bad) != 0: + raise DistutilsArgError( + "Invalid --init-system: %s" % (','.join(bad))) elif self.init_system: - self.distribution.data_files.append( - (INITSYS_ROOTS[self.init_system], - INITSYS_FILES[self.init_system])) + for sys in self.init_systems: + print("adding %s: %s" % (sys, str(INITSYS_ROOTS[sys]))) + self.distribution.data_files.append( + (INITSYS_ROOTS[sys], INITSYS_FILES[sys])) # Force that command to reinitalize (with new file list) self.distribution.reinitialize_command('install_data', True) -- cgit v1.2.3 From ee4a64ecad554901a46bf8c8d2fb81f816a91818 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 23 Jul 2014 15:54:46 +0100 Subject: refactor --- setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e27997de..1a6d0cf4 100755 --- a/setup.py +++ b/setup.py @@ -109,13 +109,13 @@ class InitsysInstallData(install): if len(bad) != 0: raise DistutilsArgError( "Invalid --init-system: %s" % (','.join(bad))) - elif self.init_system: - for sys in self.init_systems: - print("adding %s: %s" % (sys, str(INITSYS_ROOTS[sys]))) - self.distribution.data_files.append( - (INITSYS_ROOTS[sys], INITSYS_FILES[sys])) - # Force that command to reinitalize (with new file list) - self.distribution.reinitialize_command('install_data', True) + + for sys in self.init_systems: + print("adding %s: %s" % (sys, str(INITSYS_ROOTS[sys]))) + self.distribution.data_files.append( + (INITSYS_ROOTS[sys], INITSYS_FILES[sys])) + # Force that command to reinitalize (with new file list) + self.distribution.reinitialize_command('install_data', True) setuptools.setup(name='cloud-init', -- cgit v1.2.3 From 6327e159f475ca4dcd97d1c6feea5f747090c41d Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 23 Jul 2014 16:48:14 +0100 Subject: fix ups --- packages/debian/rules | 2 +- setup.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/packages/debian/rules b/packages/debian/rules index c1344e60..d3409c7e 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -4,7 +4,7 @@ DEB_PYTHON2_MODULE_PACKAGES = cloud-init INIT_SYSTEM ?= upstart,systemd %: - dh $@ --with python2,systemd --build-system pybuild + dh $@ --with python2,systemd --buildsystem pybuild override_dh_install: dh_install diff --git a/setup.py b/setup.py index 1a6d0cf4..8b1e6ece 100755 --- a/setup.py +++ b/setup.py @@ -93,13 +93,13 @@ class InitsysInstallData(install): def initialize_options(self): install.initialize_options(self) - self.init_system = None + self.init_system = "" def finalize_options(self): install.finalize_options(self) - if self.init_systems and isinstance(self.init_systems, str): - self.init_systems = self.init_systems.split(",") + if self.init_system and isinstance(self.init_system, str): + self.init_system = self.init_system.split(",") if len(self.init_system) == 0: raise DistutilsArgError(("You must specify one of (%s) when" @@ -110,7 +110,7 @@ class InitsysInstallData(install): raise DistutilsArgError( "Invalid --init-system: %s" % (','.join(bad))) - for sys in self.init_systems: + for sys in self.init_system: print("adding %s: %s" % (sys, str(INITSYS_ROOTS[sys]))) self.distribution.data_files.append( (INITSYS_ROOTS[sys], INITSYS_FILES[sys])) -- cgit v1.2.3 From f27f79926371ac0458452508179c4f823a61c82b Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 24 Jul 2014 08:53:54 -0400 Subject: remove print statement from setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1b0e8fd0..502b057b 100755 --- a/setup.py +++ b/setup.py @@ -117,7 +117,6 @@ class InitsysInstallData(install): "Invalid --init-system: %s" % (','.join(bad))) for sys in self.init_system: - print("adding %s: %s" % (sys, str(INITSYS_ROOTS[sys]))) self.distribution.data_files.append( (INITSYS_ROOTS[sys], INITSYS_FILES[sys])) # Force that command to reinitalize (with new file list) -- cgit v1.2.3 From d6b77380f9e0a3d083300c6168c71466068094cf Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 24 Jul 2014 09:06:16 -0400 Subject: pep8 fixes (2 unrelated to this mp) --- cloudinit/netinfo.py | 4 ++-- setup.py | 2 ++ tests/unittests/test_handler/test_handler_growpart.py | 4 ++-- tests/unittests/test_handler/test_handler_seed_random.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py index 30b6f3b3..1bdca9f7 100644 --- a/cloudinit/netinfo.py +++ b/cloudinit/netinfo.py @@ -56,8 +56,8 @@ def netdev_info(empty=""): # newer (freebsd and fedora) show 'inet xx.yy' # just skip this 'inet' entry. (LP: #1285185) try: - if (toks[i] in ("inet", "inet6") and - toks[i + 1].startswith("addr:")): + if ((toks[i] in ("inet", "inet6") and + toks[i + 1].startswith("addr:"))): continue except IndexError: pass diff --git a/setup.py b/setup.py index 502b057b..556103b9 100755 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ import subprocess def is_f(p): return os.path.isfile(p) + def tiny_p(cmd, capture=True): # Darn python 2.6 doesn't have check_output (argggg) stdout = subprocess.PIPE @@ -51,6 +52,7 @@ def tiny_p(cmd, capture=True): % (cmd, ret, out, err)) return (out, err) + def systemd_unitdir(): cmd = ['pkg-config', '--variable=systemdsystemunitdir', 'systemd'] try: diff --git a/tests/unittests/test_handler/test_handler_growpart.py b/tests/unittests/test_handler/test_handler_growpart.py index f2ed4597..f6dc4521 100644 --- a/tests/unittests/test_handler/test_handler_growpart.py +++ b/tests/unittests/test_handler/test_handler_growpart.py @@ -188,8 +188,8 @@ class TestResize(MockerTestCase): self.assertEqual(cc_growpart.RESIZE.SKIPPED, find(enoent[0], resized)[1]) #self.assertEqual(resize_calls, - #[("/dev/XXda", "1", "/dev/XXda1"), - #("/dev/YYda", "2", "/dev/YYda2")]) + # [("/dev/XXda", "1", "/dev/XXda1"), + # ("/dev/YYda", "2", "/dev/YYda2")]) finally: cc_growpart.device_part_info = opinfo os.stat = real_stat diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/test_handler/test_handler_seed_random.py index 7bddb238..40481f16 100644 --- a/tests/unittests/test_handler/test_handler_seed_random.py +++ b/tests/unittests/test_handler/test_handler_seed_random.py @@ -1,4 +1,4 @@ - # Copyright (C) 2013 Hewlett-Packard Development Company, L.P. +# Copyright (C) 2013 Hewlett-Packard Development Company, L.P. # # Author: Juerg Haefliger # -- cgit v1.2.3