summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-09-17 11:25:49 +0200
committerJan Pokorný <jpokorny@redhat.com>2014-09-17 22:47:12 +0200
commite43e517a622366a1dec51e145ffc7b3351144360 (patch)
treea3ab348a76560d8f3963553c22fb7f6c878931b2
parent6d346a77a20853a02d4f51819e6e0afe367f227f (diff)
downloadclufter-e43e517a622366a1dec51e145ffc7b3351144360.tar.gz
clufter-e43e517a622366a1dec51e145ffc7b3351144360.tar.xz
clufter-e43e517a622366a1dec51e145ffc7b3351144360.zip
travis: make install phase install also test-specific deps
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--.travis.yml2
-rw-r--r--__root__/setup.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index a9917c1..c47f9d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,6 @@ install:
--ra-metadata-dir=$(pwd)/cluster
--ccs-flatten=${HOME}/ccs_flatten
- cat setup.cfg
- - pip install -qe . || { cat ~/.pip/pip.log; false; }
+ - pip install -qe .[test] || { cat ~/.pip/pip.log; false; }
- popd
script: ./run-tests
diff --git a/__root__/setup.py b/__root__/setup.py
index 3624e24..4363652 100644
--- a/__root__/setup.py
+++ b/__root__/setup.py
@@ -515,6 +515,10 @@ setup(
# see also comment by ``package data''
include_package_data=False,
+ extras_require={
+ 'test': cond_require('unittest2', unittest='runner')
+ },
+
# TODO: uncomment this when ready for tests
test_suite='{0}.tests'.format(pkg_name),
tests_require=cond_require('unittest2', unittest='runner'),