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:00 UTC
[29/50] [abbrv] beam git commit: Fix python container gradle build
Fix python container gradle build
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6a72d799
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6a72d799
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6a72d799
Branch: refs/heads/master
Commit: 6a72d79978c9e186e5b8abd81ac701901aa05a52
Parents: 294a0a7
Author: Henning Rohde <he...@google.com>
Authored: Fri Nov 3 13:22:39 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:15 2017 -0800
----------------------------------------------------------------------
build.gradle | 2 ++
sdks/python/container/build.gradle | 1 +
settings.gradle | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/6a72d799/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 3642930..18a9fab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -167,7 +167,9 @@ rat {
excludes = [
// Exclude files generated by the Gradle build process
"**/.gradle/**",
+ "**/.gogradle/**",
"**/build/**",
+ "**/vendor/**",
// .gitignore: Ignore files generated by the Maven build process
"**/target/**/*",
http://git-wip-us.apache.org/repos/asf/beam/blob/6a72d799/sdks/python/container/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/python/container/build.gradle b/sdks/python/container/build.gradle
index 6a2f532..eb201b4 100644
--- a/sdks/python/container/build.gradle
+++ b/sdks/python/container/build.gradle
@@ -25,6 +25,7 @@ description = "Apache Beam :: SDKs :: Python :: Container"
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
}
}
http://git-wip-us.apache.org/repos/asf/beam/blob/6a72d799/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index c75927f..10d3a47 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -67,7 +67,7 @@ include ':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-harness'
include ':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-container'
include ':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-java8tests'
include ':beam-sdks-parent:beam-sdks-java-parent'
-//include ':beam-sdks-parent:beam-sdks-python:beam-sdks-python-container'
+include ':beam-sdks-parent:beam-sdks-python:beam-sdks-python-container'
//include ':beam-sdks-parent:beam-sdks-python'
include ':beam-sdks-parent'
include ':beam-runners-parent:beam-runners-core-construction-java'
@@ -140,7 +140,7 @@ project(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-harness').projec
project(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-container').projectDir = "$rootDir/sdks/java/container" as File
project(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-java8tests').projectDir = "$rootDir/sdks/java/java8tests" as File
project(':beam-sdks-parent:beam-sdks-java-parent').projectDir = "$rootDir/sdks/java" as File
-//project(':beam-sdks-parent:beam-sdks-python:beam-sdks-python-container').projectDir = "$rootDir/sdks/python/container" as File
+project(':beam-sdks-parent:beam-sdks-python:beam-sdks-python-container').projectDir = "$rootDir/sdks/python/container" as File
//project(':beam-sdks-parent:beam-sdks-python').projectDir = "$rootDir/sdks/python" as File
project(':beam-sdks-parent').projectDir = "$rootDir/sdks" as File
project(':beam-runners-parent:beam-runners-core-construction-java').projectDir = "$rootDir/runners/core-construction-java" as File