You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2017/01/30 21:26:07 UTC
[1/2] beam git commit: Revert python-sdk only changes in travis,
and clean incubator keywords.
Repository: beam
Updated Branches:
refs/heads/python-sdk 1390699c3 -> be0e32e36
Revert python-sdk only changes in travis, and clean incubator keywords.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0b4ee73a
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0b4ee73a
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0b4ee73a
Branch: refs/heads/python-sdk
Commit: 0b4ee73a36f47a8f1b5c7ece775eae2c68af4245
Parents: 1390699
Author: Ahmet Altay <al...@google.com>
Authored: Mon Jan 30 12:51:15 2017 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Jan 30 13:25:32 2017 -0800
----------------------------------------------------------------------
.travis.yml | 15 +++++++++++++++
.../examples/cookbook/datastore_wordcount.py | 2 +-
sdks/python/setup.py | 4 ++--
3 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/0b4ee73a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index cb6f790..a392f7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,20 @@ env:
matrix:
include:
+ # On OSX, run with default JDK only.
+ - os: osx
+
+ # On Linux, run with specific JDKs only.
+ - os: linux
+ env: CUSTOM_JDK="oraclejdk8" MAVEN_OVERRIDE="$MAVEN_OVERRIDE $MAVEN_CONTAINER_OVERRIDE"
+ - os: linux
+ env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="$MAVEN_OVERRIDE $MAVEN_CONTAINER_OVERRIDE"
+ - os: linux
+ env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="$MAVEN_OVERRIDE $MAVEN_CONTAINER_OVERRIDE"
+ - os: linux
+ env: MAVEN_OVERRIDE="-Peclipse-jdt -DskipTests $MAVEN_OVERRIDE $MAVEN_CONTAINER_OVERRIDE" CUSTOM_JDK="oraclejdk8"
+
+ # Python SDK tests.
- os: osx
env: TEST_PYTHON="1"
- os: linux
@@ -51,6 +65,7 @@ before_install:
- cat ~/.mavenrc
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
- 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
http://git-wip-us.apache.org/repos/asf/beam/blob/0b4ee73a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
index 25abb3e..067cb80 100644
--- a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
+++ b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
@@ -23,7 +23,7 @@ Cloud Datastore operations.
See https://developers.google.com/datastore/ for more details on Google Cloud
Datastore.
-See http://beam.incubator.apache.org/get-started/quickstart on
+See https://beam.apache.org/get-started/quickstart on
how to run a Beam pipeline.
Read-only Mode: In this mode, this example reads Cloud Datastore entities using
http://git-wip-us.apache.org/repos/asf/beam/blob/0b4ee73a/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 37125c2..e75a583 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -37,10 +37,10 @@ def get_version():
PACKAGE_NAME = 'apache-beam-sdk'
PACKAGE_VERSION = get_version()
PACKAGE_DESCRIPTION = 'Apache Beam SDK for Python'
-PACKAGE_URL = 'https://beam.incubator.apache.org'
+PACKAGE_URL = 'https://beam.apache.org'
PACKAGE_DOWNLOAD_URL = 'TBD'
PACKAGE_AUTHOR = 'Apache Software Foundation'
-PACKAGE_EMAIL = 'dev@beam.incubator.apache.org'
+PACKAGE_EMAIL = 'dev@beam.apache.org'
PACKAGE_KEYWORDS = 'apache beam'
PACKAGE_LONG_DESCRIPTION = '''
TBD
[2/2] beam git commit: This closes #1871
Posted by da...@apache.org.
This closes #1871
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/be0e32e3
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/be0e32e3
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/be0e32e3
Branch: refs/heads/python-sdk
Commit: be0e32e36313390ed04106d57f4c9dfeabb91b4d
Parents: 1390699 0b4ee73
Author: Davor Bonaci <da...@google.com>
Authored: Mon Jan 30 13:25:53 2017 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Jan 30 13:25:53 2017 -0800
----------------------------------------------------------------------
.travis.yml | 15 +++++++++++++++
.../examples/cookbook/datastore_wordcount.py | 2 +-
sdks/python/setup.py | 4 ++--
3 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------