From b53b1a3581a7b99b3dc8979a8803871ac452b94c Mon Sep 17 00:00:00 2001 From: baztian Date: Fri, 10 Mar 2017 20:18:19 +0100 Subject: [PATCH] Use $HOME for mvn to see if this can use some travis standard repos or so. --- .travis.yml | 1 + tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d88f2b8..b8fd49b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ matrix: before_install: - ci/before_install.sh - export PATH="$HOME/bin:$PATH" + - export TRAVISHOME="$HOME" install: - pip install coveralls diff --git a/tox.ini b/tox.ini index 1cf242f..a074c44 100644 --- a/tox.ini +++ b/tox.ini @@ -10,9 +10,9 @@ python = [testenv] # usedevelop required to enable coveralls source code view. -usedevelop=True +usedevelop = True +passenv = TRAVISHOME whitelist_externals = mvn -passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH setenv = CLASSPATH = {envdir}/javalib/* driver-mock: TESTNAME=test_mock @@ -28,10 +28,10 @@ deps = coverage commands = python --version - python ci/jipconf_subst.py {envdir} {toxworkdir}/shared + python ci/jipconf_subst.py {envdir} {env:TRAVISHOME:{toxworkdir}/shared} driver-hsqldb: jip install org.hsqldb:hsqldb:1.8.0.10 driver-sqliteXerial: jip install org.xerial:sqlite-jdbc:3.7.2 - driver-mock: mvn -Dmaven.repo.local={toxworkdir}/shared/.m2/repository -f mockdriver/pom.xml install + driver-mock: mvn -Dmaven.repo.local={env:TRAVISHOME:{toxworkdir}/shared}/.m2/repository -f mockdriver/pom.xml install driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT coverage run -a --source jaydebeapi test/testsuite.py {env:TESTNAME} driver-hsqldb: coverage run -a --source jaydebeapi test/doctests.py