diff --git a/.travis.yml b/.travis.yml index 7ec4c24..1c74ffb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - TOX_ENV=docs - TOX_ENV=flake8 install: - - pip install tox pytest + - pip install tox script: - tox -e $TOX_ENV diff --git a/setup.py b/setup.py index 81fa1d8..6ed0914 100644 --- a/setup.py +++ b/setup.py @@ -18,6 +18,14 @@ long_description = """WSDL parsing services package for Web Services for Python. from src.wstools.version import __version__ +install_requires = [ + 'docutils' +] + +test_requires = [ + 'nose' +] + setup( name="wstools", version=__version__, @@ -29,5 +37,6 @@ setup( packages=['wstools'], package_dir={'': 'src'}, include_package_data=True, - install_requires=['docutils'], + install_requires=install_requires, + tests_require=test_requires, ) diff --git a/tox.ini b/tox.ini index b06ef41..f9f9891 100644 --- a/tox.ini +++ b/tox.ini @@ -3,10 +3,8 @@ minversion = 1.3 envlist = py26,py27,docs,flake8 [testenv] -deps= - pytest -commands= - nosetests +deps=nose +commands=nosetests [testenv:py26] @@ -17,12 +15,10 @@ downloadcache={toxworkdir}/downloadcache basepython=python2.7 changedir=doc deps=sphinx -commands= - sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html +commands=sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:flake8] basepython=python2.7 deps=flake8 -commands= - flake8 djohno +commands=flake8 djohno