diff --git a/ci/jipconf_subst.py b/ci/jipconf_subst.py index f7caaa7..b3cf5ea 100644 --- a/ci/jipconf_subst.py +++ b/ci/jipconf_subst.py @@ -5,7 +5,7 @@ import sys home=sys.argv[1] dist=sys.argv[2] -with open(path.join(home, '.jip'), "w") as out: +with open(path.join(home, '.jip_config'), "w") as out: print("""[repos:local] uri={0}/.m2/repository/ type=local diff --git a/tox.ini b/tox.ini index f66ef64..b8b477e 100644 --- a/tox.ini +++ b/tox.ini @@ -12,12 +12,12 @@ deps = py27: -rrequirements-python-2.7.txt py3: -rrequirements-python-3.4.txt # not required for jython >= 2.7 anymore jython: -rrequirements-jython.txt - jip==0.9.3 + jip==0.9.9 commands = # Should be changed to {toxinidir} once i manage to download javalibs in tox - python ci/jipconf_subst.py {envdir} {distdir} + python ci/jipconf_subst.py {envdir} {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={distdir}/.m2/repository -f mockdriver/pom.xml install + driver-mock: mvn -Dmaven.repo.local={toxworkdir}/shared/.m2/repository -f mockdriver/pom.xml install driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT {envbindir}/python test/testsuite.py {env:TESTNAME}