shift to pytest
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5ca190b4 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5ca190b4 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5ca190b4 Branch: refs/heads/trunk Commit: 5ca190b421b8deb72688b28738401ab1d0dd2cb3 Parents: 6ef330e Author: Anthony Shaw <anthonys...@apache.org> Authored: Tue Apr 11 15:21:13 2017 +1000 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Tue Apr 11 15:21:13 2017 +1000 ---------------------------------------------------------------------- setup.py | 2 ++ tox.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5ca190b4/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 1e05352..2d3b063 100644 --- a/setup.py +++ b/setup.py @@ -271,6 +271,8 @@ setup( author='Apache Software Foundation', author_email='d...@libcloud.apache.org', install_requires=install_requires, + tests_require=['pytest'], + setup_requires=['pytest-runner'], packages=get_packages('libcloud'), package_dir={ 'libcloud': 'libcloud', http://git-wip-us.apache.org/repos/asf/libcloud/blob/5ca190b4/tox.ini ---------------------------------------------------------------------- diff --git a/tox.ini b/tox.ini index 6447b79..35b101c 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ deps = -r{toxinidir}/requirements-tests.txt lockfile py{2.6,2.7}: paramiko - py{2.6}: unittest2 + pytest set-env = COVERALLS_REPO_TOKEN = GAB5ZuovdsVEFxSIyZE8YhDYU886iGW54 commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
