* Added a simple tox.ini file
* Use universal_newlines in setup.py so it will work properly in Python 3. * Fix a pyflakes complaint in setup.py * Add a simple MANIFEST.in
This commit is contained in:
parent
df8098fe61
commit
35e4d597e3
3
.bzrignore
Normal file
3
.bzrignore
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
.tox
|
||||||
|
dist
|
||||||
|
cloud_init.egg-info
|
8
MANIFEST.in
Normal file
8
MANIFEST.in
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
include *.py MANIFEST.in ChangeLog
|
||||||
|
global-include *.txt *.rst *.ini *.in *.conf *.cfg *.sh
|
||||||
|
graft tools
|
||||||
|
prune build
|
||||||
|
prune dist
|
||||||
|
prune .tox
|
||||||
|
prune .bzr
|
||||||
|
exclude .bzrignore
|
7
setup.py
7
setup.py
@ -45,7 +45,8 @@ def tiny_p(cmd, capture=True):
|
|||||||
stdout = None
|
stdout = None
|
||||||
stderr = None
|
stderr = None
|
||||||
sp = subprocess.Popen(cmd, stdout=stdout,
|
sp = subprocess.Popen(cmd, stdout=stdout,
|
||||||
stderr=stderr, stdin=None)
|
stderr=stderr, stdin=None,
|
||||||
|
universal_newlines=True)
|
||||||
(out, err) = sp.communicate()
|
(out, err) = sp.communicate()
|
||||||
ret = sp.returncode
|
ret = sp.returncode
|
||||||
if ret not in [0]:
|
if ret not in [0]:
|
||||||
@ -144,9 +145,9 @@ class InitsysInstallData(install):
|
|||||||
raise DistutilsArgError(
|
raise DistutilsArgError(
|
||||||
"Invalid --init-system: %s" % (','.join(bad)))
|
"Invalid --init-system: %s" % (','.join(bad)))
|
||||||
|
|
||||||
for sys in self.init_system:
|
for system in self.init_system:
|
||||||
self.distribution.data_files.append(
|
self.distribution.data_files.append(
|
||||||
(INITSYS_ROOTS[sys], INITSYS_FILES[sys]))
|
(INITSYS_ROOTS[system], INITSYS_FILES[system]))
|
||||||
# Force that command to reinitalize (with new file list)
|
# Force that command to reinitalize (with new file list)
|
||||||
self.distribution.reinitialize_command('install_data', True)
|
self.distribution.reinitialize_command('install_data', True)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user