Briq/jaydebeapi
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix maven repo access again.

Browse Source
This commit is contained in:
baztian
2017-03-07 20:34:31 +01:00
parent 2e3d8ce1a8
commit 72dbb832d9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -38,7 +38,7 @@ before_install:
install: install:
- if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn -Dmaven.repo.local=$VIRTUAL_ENV/.m2/repository install) ;fi - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn -Dmaven.repo.local=$VIRTUAL_ENV/.m2/repository install) ;fi
- if [ -n "$JDBC_DRIVER" ]; then python jipconf_subst.py $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip - if [ -n "$JDBC_DRIVER" ]; then python ci/jipconf_subst.py $VIRTUAL_ENV $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
- source $HOME/myvirtualenv/bin/activate - source $HOME/myvirtualenv/bin/activate
- pip install -e . - pip install -e .
- if [ -z "$JYTHON" ]; then pip install coveralls ;fi - if [ -z "$JYTHON" ]; then pip install coveralls ;fi
jipconf_subst.py → ci/jipconf_subst.py
+2 -1
View File
@@ -4,6 +4,7 @@ from os import path
import sys import sys
home=sys.argv[1] home=sys.argv[1]
dist=sys.argv[2]
with open(path.join(home, '.jip'), "w") as out: with open(path.join(home, '.jip'), "w") as out:
print("""[repos:local] print("""[repos:local]
uri={0}/.m2/repository/ uri={0}/.m2/repository/
@@ -12,4 +13,4 @@ type=local
[repos:central] [repos:central]
uri=http://repo1.maven.org/maven2/ uri=http://repo1.maven.org/maven2/
type=remote type=remote
""".format(home), file=out) """.format(dist), file=out)
tox.ini
+1 -1
View File
@@ -15,7 +15,7 @@ deps =
jip==0.9.3 jip==0.9.3
commands = commands =
# Should be changed to {toxinidir} once i manage to download javalibs in tox # Should be changed to {toxinidir} once i manage to download javalibs in tox
python jipconf_subst.py {distdir} python ci/jipconf_subst.py {envdir} {distdir}
driver-hsqldb: jip install org.hsqldb:hsqldb:1.8.0.10 driver-hsqldb: jip install org.hsqldb:hsqldb:1.8.0.10
driver-sqliteXerial: jip install org.xerial:sqlite-jdbc:3.7.2 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={distdir}/.m2/repository -f mockdriver/pom.xml install