* 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:
Barry Warsaw 2015-01-21 15:14:24 -05:00
parent df8098fe61
commit 35e4d597e3
4 changed files with 28 additions and 3 deletions

3
.bzrignore Normal file
View File

@ -0,0 +1,3 @@
.tox
dist
cloud_init.egg-info

8
MANIFEST.in Normal file
View 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

View File

@ -45,7 +45,8 @@ def tiny_p(cmd, capture=True):
stdout = None
stderr = None
sp = subprocess.Popen(cmd, stdout=stdout,
stderr=stderr, stdin=None)
stderr=stderr, stdin=None,
universal_newlines=True)
(out, err) = sp.communicate()
ret = sp.returncode
if ret not in [0]:
@ -144,9 +145,9 @@ class InitsysInstallData(install):
raise DistutilsArgError(
"Invalid --init-system: %s" % (','.join(bad)))
for sys in self.init_system:
for system in self.init_system:
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)
self.distribution.reinitialize_command('install_data', True)

13
tox.ini Normal file
View File

@ -0,0 +1,13 @@
[tox]
envlist = py26,py27,py34
recreate = True
[testenv]
commands = python -m nose tests
deps =
httpretty>=0.7.1
mock
mocker
nose
pep8==1.5.7
pyflakes