You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/03/21 17:15:51 UTC

[1/2] beam git commit: [BEAM-1769] Travis should run all tox tests

Repository: beam
Updated Branches:
  refs/heads/master 0895ec106 -> 030528f3d


[BEAM-1769] Travis should run all tox tests


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

Branch: refs/heads/master
Commit: aa716b4d2b8ddf9aaa3011361884960258978202
Parents: 0895ec1
Author: Sourabh Bajaj <so...@google.com>
Authored: Mon Mar 20 19:13:30 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Mar 21 10:15:22 2017 -0700

----------------------------------------------------------------------
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/aa716b4d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c896431..2a75ebc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,6 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
   - export BEAM_SUREFIRE_ARGLINE="-Xmx512m"
   # Python SDK environment settings.
-  - export TOX_ENV=py27
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export TOX_HOME=$HOME/Library/Python/2.7/bin; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export TOX_HOME=$HOME/.local/bin; fi
 
@@ -80,7 +79,7 @@ install:
   - rm -rf "$HOME/.m2/repository/org/apache/beam"
 
 script:
-  - if [ "$TEST_PYTHON" ]; then travis_retry $TOX_HOME/tox -e $TOX_ENV -c sdks/python/tox.ini; fi
+  - if [ "$TEST_PYTHON" ]; then travis_retry $TOX_HOME/tox -c sdks/python/tox.ini; fi
   - if [ ! "$TEST_PYTHON" ]; then travis_retry mvn --batch-mode --update-snapshots --no-snapshot-updates --threads 1C $MAVEN_OVERRIDE install && travis_retry bash -ex .travis/test_wordcount.sh; fi
 
 cache:


[2/2] beam git commit: This closes #2280

Posted by al...@apache.org.
This closes #2280


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

Branch: refs/heads/master
Commit: 030528f3d359eaec4945388294b4118b543fa5a8
Parents: 0895ec1 aa716b4
Author: Ahmet Altay <al...@google.com>
Authored: Tue Mar 21 10:15:38 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Mar 21 10:15:38 2017 -0700

----------------------------------------------------------------------
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------