Commit ee4a174e authored by Barry Warsaw's avatar Barry Warsaw

* 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
parent 8d453d2a
.tox
dist
cloud_init.egg-info
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
......@@ -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)
......
[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
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