Skip to content
This repository was archived by the owner on Apr 19, 2022. It is now read-only.

Commit

Permalink
Merge pull request #93 from ravwojdyla/upgrade_tox
Browse files Browse the repository at this point in the history
Use multi dimension from Tox 1.8.0
  • Loading branch information
ravwojdyla committed Oct 11, 2014
2 parents 037820a + 50a63f1 commit 863fc8c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 29 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ nose
unittest2
mock
virtualenv>=1.11.2
tox>=1.7.2
tox>=1.8.0
sphinx
sphinx_rtd_theme
fig
40 changes: 12 additions & 28 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,33 +1,17 @@
[tox]
envlist = py26-cdh,py27-cdh,py26-hdp,py27-hdp
envlist = {py26,py27}-{cdh,hdp}

[testenv]
usedevelop=True
usedevelop = True
deps = -rrequirements-dev.txt
basepython =
py26: python2.6
py27: python2.7
setenv =
cdh: HADOOP_DISTRO=cdh
cdh: HADOOP_HOME=/tmp/hadoop-cdh
hdp: HADOOP_DISTRO=hdp
hdp: HADOOP_HOME=/tmp/hadoop-hdp
commands =
{toxinidir}/scripts/ci/setup_env.sh
{toxinidir}/scripts/ci/run_tests.sh []

[testenv:py26-cdh]
basepython=python2.6
setenv=
HADOOP_DISTRO=cdh
HADOOP_HOME=/tmp/hadoop-cdh

[testenv:py26-hdp]
basepython=python2.6
setenv=
HADOOP_DISTRO=hdp
HADOOP_HOME=/tmp/hadoop-hdp

[testenv:py27-cdh]
basepython=python2.7
setenv=
HADOOP_DISTRO=cdh
HADOOP_HOME=/tmp/hadoop-cdh

[testenv:py27-hdp]
basepython=python2.7
setenv=
HADOOP_DISTRO=hdp
HADOOP_HOME=/tmp/hadoop-hdp
{toxinidir}/scripts/ci/setup_env.sh
{toxinidir}/scripts/ci/run_tests.sh []

0 comments on commit 863fc8c

Please sign in to comment.