You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/11/17 22:30:13 UTC
[42/50] [abbrv] beam git commit: Fix gcemd and gcsproxy builds. Fix
whitespace formatting.
Fix gcemd and gcsproxy builds.
Fix whitespace formatting.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/17da0e0e
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/17da0e0e
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/17da0e0e
Branch: refs/heads/master
Commit: 17da0e0e355b58be4d4c26b784cb69b58b056cf4
Parents: 4fcee85
Author: Luke Cwik <lc...@google.com>
Authored: Tue Nov 7 11:42:48 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:16 2017 -0800
----------------------------------------------------------------------
runners/apex/build.gradle | 6 ++---
runners/direct-java/build.gradle | 4 +--
runners/gcp/gcemd/build.gradle | 13 ++++-----
runners/gcp/gcsproxy/build.gradle | 13 ++++-----
runners/google-cloud-dataflow-java/build.gradle | 2 +-
runners/spark/build.gradle | 2 +-
sdks/go/build.gradle | 14 +++++-----
sdks/java/core/build.gradle | 2 +-
sdks/python/build.gradle | 14 +++++-----
sdks/python/container/build.gradle | 28 ++++++++++----------
10 files changed, 46 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/runners/apex/build.gradle
----------------------------------------------------------------------
diff --git a/runners/apex/build.gradle b/runners/apex/build.gradle
index f8383c1..69d6d42 100644
--- a/runners/apex/build.gradle
+++ b/runners/apex/build.gradle
@@ -22,10 +22,10 @@ applyJavaNature()
description = "Apache Beam :: Runners :: Apex"
/*
- * We need to rely on manually specifying these evaluationDependsOn to ensure that
+ * We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
- * we are attempting to reference the "sourceSets.test.output" directly.
- * TODO: Swap to generating test artifacts which we can then rely on instead of
+ * we are attempting to reference the "sourceSets.test.output" directly.
+ * TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/runners/direct-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
index 5a7f83a..af50218 100644
--- a/runners/direct-java/build.gradle
+++ b/runners/direct-java/build.gradle
@@ -21,11 +21,11 @@ applyJavaNature()
description = "Apache Beam :: Runners :: Direct Java"
-/*
+/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
- * TODO: Swap to generating test artifacts which we can then rely on instead of
+ * TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-runners-parent:beam-runners-core-java")
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/runners/gcp/gcemd/build.gradle
----------------------------------------------------------------------
diff --git a/runners/gcp/gcemd/build.gradle b/runners/gcp/gcemd/build.gradle
index 787d1b3..a32dc77 100644
--- a/runners/gcp/gcemd/build.gradle
+++ b/runners/gcp/gcemd/build.gradle
@@ -22,12 +22,9 @@ applyGoNature()
description = "Apache Beam :: Runners :: Google Cloud Platform :: GCE metadata provisioning"
golang {
- packagePath = 'github.com/apache/beam/runners/gcp/gcemd'
- build {
- go 'build -o ./build/bin/gcemd github.com/apache/beam/cmd/gcemd'
-
- // The symlinks makes it hard (impossible?) to do a wildcard build
- // of pkg. Go build refuses to follow symlinks. Drop for now. The files
- // are built when tested anyway.
- }
+ packagePath = 'github.com/apache/beam/runners/gcp/gcemd'
+ build {
+ targetPlatform = ['linux-amd64']
+ outputLocation = './build/target/${GOOS}_${GOARCH}/gcemd'
+ }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/runners/gcp/gcsproxy/build.gradle
----------------------------------------------------------------------
diff --git a/runners/gcp/gcsproxy/build.gradle b/runners/gcp/gcsproxy/build.gradle
index 94b5394..1a02afa 100644
--- a/runners/gcp/gcsproxy/build.gradle
+++ b/runners/gcp/gcsproxy/build.gradle
@@ -22,12 +22,9 @@ applyGoNature()
description = "Apache Beam :: Runners :: Google Cloud Platform :: GCS artifact proxy"
golang {
- packagePath = 'github.com/apache/beam/runners/gcp/gcsproxy'
- build {
- go 'build -o ./build/bin/gcsproxy github.com/apache/beam/cmd/gcsproxy'
-
- // The symlinks makes it hard (impossible?) to do a wildcard build
- // of pkg. Go build refuses to follow symlinks. Drop for now. The files
- // are built when tested anyway.
- }
+ packagePath = 'github.com/apache/beam/runners/gcp/gcsproxy'
+ build {
+ targetPlatform = ['linux-amd64']
+ outputLocation = './build/target/${GOOS}_${GOARCH}/gcsproxy'
+ }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/runners/google-cloud-dataflow-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index bd1e593..41c7c2a 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -43,7 +43,7 @@ processResources {
// Exclude tests that need a runner
test {
systemProperty "beamTestPipelineOptions", ""
- systemProperty "beamUseDummyRunner", "true"
+ systemProperty "beamUseDummyRunner", "true"
}
dependencies {
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/runners/spark/build.gradle
----------------------------------------------------------------------
diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle
index 9198161..19e8d0f 100644
--- a/runners/spark/build.gradle
+++ b/runners/spark/build.gradle
@@ -41,7 +41,7 @@ test {
"--enableSparkMetricSinks=true"
]"""
// Only one SparkContext may be running in a JVM (SPARK-2243)
- forkEvery 1
+ forkEvery 1
useJUnit {
excludeCategories "org.apache.beam.runners.spark.UsesCheckpointRecovery"
excludeCategories "org.apache.beam.runners.spark.StreamingTest"
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/sdks/go/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/go/build.gradle b/sdks/go/build.gradle
index fe65b45..abf9292 100644
--- a/sdks/go/build.gradle
+++ b/sdks/go/build.gradle
@@ -22,12 +22,12 @@ applyGoNature()
description = "Apache Beam :: SDKs :: Go"
golang {
- packagePath = 'github.com/apache/beam/sdks/go'
- build {
- go 'build -o ./build/bin/beamctl github.com/apache/beam/sdks/go/cmd/beamctl'
+ packagePath = 'github.com/apache/beam/sdks/go'
+ build {
+ go 'build -o ./build/bin/beamctl github.com/apache/beam/sdks/go/cmd/beamctl'
- // The symlinks makes it hard (impossible?) to do a wildcard build
- // of pkg. Go build refuses to follow symlinks. Drop for now. The files
- // are built when tested anyway.
- }
+ // The symlinks makes it hard (impossible?) to do a wildcard build
+ // of pkg. Go build refuses to follow symlinks. Drop for now. The files
+ // are built when tested anyway.
+ }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/sdks/java/core/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index cb6f759..8ad3db1 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -40,7 +40,7 @@ processResources {
// Exclude tests that need a runner
test {
- systemProperty "beamUseDummyRunner", "true"
+ systemProperty "beamUseDummyRunner", "true"
useJUnit {
excludeCategories "org.apache.beam.sdk.testing.NeedsRunner"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/sdks/python/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/python/build.gradle b/sdks/python/build.gradle
index a0281b2..7d82afa 100644
--- a/sdks/python/build.gradle
+++ b/sdks/python/build.gradle
@@ -35,9 +35,9 @@ task setupTest {
}
task sdist {
- exec {
- commandLine 'python', 'setup.py', 'sdist', '--formats', 'zip,gztar', '--dist-dir', project.buildDir
- }
+ exec {
+ commandLine 'python', 'setup.py', 'sdist', '--formats', 'zip,gztar', '--dist-dir', project.buildDir
+ }
}
task cleanPython {
@@ -51,10 +51,10 @@ clean.dependsOn cleanPython
task buildPython {
doLast {
- println 'Building Python Dependencies'
- exec {
- commandLine 'python', 'setup.py', 'build', '--build-base', project.buildDir
- }
+ println 'Building Python Dependencies'
+ exec {
+ commandLine 'python', 'setup.py', 'build', '--build-base', project.buildDir
+ }
}
}
build.dependsOn buildPython
http://git-wip-us.apache.org/repos/asf/beam/blob/17da0e0e/sdks/python/container/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/python/container/build.gradle b/sdks/python/container/build.gradle
index feba865..8d852a9 100644
--- a/sdks/python/container/build.gradle
+++ b/sdks/python/container/build.gradle
@@ -28,26 +28,26 @@ description = "Apache Beam :: SDKs :: Python :: Container"
resolveBuildDependencies.dependsOn ":beam-sdks-parent:beam-sdks-go:build"
dependencies {
- golang {
- // TODO(herohde): use "./" prefix to prevent gogradle use base github path, for now.
- // TODO(herohde): get the pkg subdirectory only, if possible. We spend mins pulling cmd/beamctl deps.
- build name: './github.com/apache/beam/sdks/go', dir: project(':beam-sdks-parent:beam-sdks-go').projectDir
- }
+ golang {
+ // TODO(herohde): use "./" prefix to prevent gogradle use base github path, for now.
+ // TODO(herohde): get the pkg subdirectory only, if possible. We spend mins pulling cmd/beamctl deps.
+ build name: './github.com/apache/beam/sdks/go', dir: project(':beam-sdks-parent:beam-sdks-go').projectDir
+ }
}
golang {
- packagePath = 'github.com/apache/beam/sdks/python/boot'
- build {
- // TODO(herohde): build local platform + linux-amd64, if possible.
- targetPlatform = ['linux-amd64']
- outputLocation = './build/target/${GOOS}_${GOARCH}/boot'
- }
+ packagePath = 'github.com/apache/beam/sdks/python/boot'
+ build {
+ // TODO(herohde): build local platform + linux-amd64, if possible.
+ targetPlatform = ['linux-amd64']
+ outputLocation = './build/target/${GOOS}_${GOARCH}/boot'
+ }
}
docker {
- // TODO(herohde): make the name easier to generate for releases.
- name System.properties['user.name'] + '-docker-apache.bintray.io/beam/python:latest'
- files "./build/"
+ // TODO(herohde): make the name easier to generate for releases.
+ name System.properties['user.name'] + '-docker-apache.bintray.io/beam/python:latest'
+ files "./build/"
}
// Ensure that making the docker image builds any required artifacts
dockerPrepare.dependsOn build