beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rober...@apache.org
Subject [1/2] incubator-beam git commit: Fixes issue with Travis CI and Mac images.
Date Mon, 10 Oct 2016 17:27:29 GMT
Repository: incubator-beam
Updated Branches:
  refs/heads/python-sdk 7d0758b64 -> 90004a09e


Fixes issue with Travis CI and Mac images.

Tox was be installed in some Mac images, but not others.


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1176049b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1176049b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1176049b

Branch: refs/heads/python-sdk
Commit: 1176049b131df06b7f98ee29a39fe1ead25cb33e
Parents: 7d0758b
Author: Pablo <pabloem@google.com>
Authored: Fri Oct 7 15:19:48 2016 -0700
Committer: Robert Bradshaw <robertwb@google.com>
Committed: Mon Oct 10 10:26:17 2016 -0700

----------------------------------------------------------------------
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1176049b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8d12668..d9d5e1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,8 @@ before_install:
 
 install:
   - if [ ! "$TEST_PYTHON" ]; then travis_retry mvn -B install clean -U -DskipTests=true;
fi
-  - if [ "$TEST_PYTHON" ]; then travis_retry pip install tox --user `whoami`; fi
+  - if [ "$TEST_PYTHON" ] && pip list | grep tox; then TOX_FILE=`which tox` ; export
TOX_HOME=`dirname $TOX_FILE`; fi
+  - if [ "$TEST_PYTHON" ] && ! pip list | grep tox; then travis_retry pip install
tox --user `whoami`; fi
 
 script:
   - if [ "$TEST_PYTHON" ]; then travis_retry $TOX_HOME/tox -e $TOX_ENV -c sdks/python/tox.ini;
fi


Mime
View raw message