From 8c119de9975cb5f692bd59056fc1050f3aed2325 Mon Sep 17 00:00:00 2001 From: baztian Date: Fri, 10 Mar 2017 09:19:39 +0100 Subject: [PATCH] Apply recommendations from https://github.com/ryanhiebert/tox-travis/issues/62 --- .travis.yml | 2 +- ci/mvnget.sh | 10 +++++----- tox.ini | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9aa315..5786242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: matrix: include: - python: 3.4 - env: JYTHON="org.python;jython-installer;2.7.0" + env: JYTHON=org.python:jython-installer:2.7.0 TOXENV="jython-driver-{hsqldb,mock}" before_install: - ci/before_install.sh diff --git a/ci/mvnget.sh b/ci/mvnget.sh index 27ac129..dc0a30e 100755 --- a/ci/mvnget.sh +++ b/ci/mvnget.sh @@ -2,12 +2,12 @@ set -e ARTIFACT_SPEC="$1" -GROUP_ID=${ARTIFACT_SPEC%%;*} -NON_GROUP_ID=${ARTIFACT_SPEC#*;} -ARTIFACT_NAME=`python -c "import re;print(re.search(r';(.*);', '$ARTIFACT_SPEC').group(1))"` +GROUP_ID=${ARTIFACT_SPEC%%:*} +NON_GROUP_ID=${ARTIFACT_SPEC#*:} +ARTIFACT_NAME=`python -c "import re;print(re.search(r':(.*):', '$ARTIFACT_SPEC').group(1))"` _PATH=${GROUP_ID/./\/}/$ARTIFACT_NAME -_ARTIFACT_SPEC_BASENAME=${NON_GROUP_ID/;/-} -VERSION=${ARTIFACT_SPEC##*;} +_ARTIFACT_SPEC_BASENAME=${NON_GROUP_ID/:/-} +VERSION=${ARTIFACT_SPEC##*:} echo "Downloading ${ARTIFACT_NAME} version ${VERSION} group id ${GROUP_ID}..." >&2 wget http://search.maven.org/remotecontent?filepath=${_PATH}/$VERSION/${_ARTIFACT_SPEC_BASENAME}.jar -O ${_ARTIFACT_SPEC_BASENAME}.jar echo "...download of ${_ARTIFACT_SPEC_BASENAME}.jar finished." >&2 diff --git a/tox.ini b/tox.ini index 7e83cae..7eef594 100644 --- a/tox.ini +++ b/tox.ini @@ -7,10 +7,6 @@ python = 2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy} 3.4: py34-driver-{hsqldb,mock,sqliteXerial} -[travis:env] -JYTHON = - org.python;jython-installer;2.7.0: jython-driver-{hsqldb,mock} - [testenv] whitelist_externals = mvn setenv =