You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ro...@apache.org on 2016/10/10 17:27:29 UTC
[1/2] incubator-beam git commit: Fixes issue with Travis CI and Mac
images.
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 <pa...@google.com>
Authored: Fri Oct 7 15:19:48 2016 -0700
Committer: Robert Bradshaw <ro...@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
[2/2] incubator-beam git commit: Closes #1068
Posted by ro...@apache.org.
Closes #1068
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/90004a09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/90004a09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/90004a09
Branch: refs/heads/python-sdk
Commit: 90004a09e6cc3fff717806aa026610f262e3ad84
Parents: 7d0758b 1176049
Author: Robert Bradshaw <ro...@google.com>
Authored: Mon Oct 10 10:27:11 2016 -0700
Committer: Robert Bradshaw <ro...@google.com>
Committed: Mon Oct 10 10:27:11 2016 -0700
----------------------------------------------------------------------
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------