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 2017/04/24 21:52:49 UTC
[5/7] beam git commit: Add apache licence to generated files.
Add apache licence to generated files.
Also add needed dependency (for docs) and fix lint.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/fbeb7e13
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/fbeb7e13
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/fbeb7e13
Branch: refs/heads/master
Commit: fbeb7e13a2d678ddb2852c2e270eb972280a40f3
Parents: 2a59b05
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Fri Apr 21 12:15:02 2017 -0700
Committer: Robert Bradshaw <ro...@gmail.com>
Committed: Mon Apr 24 14:52:28 2017 -0700
----------------------------------------------------------------------
pom.xml | 3 +++
.../apache_beam/runners/api/beam_fn_api_pb2.py | 17 +++++++++++++++++
.../runners/api/beam_fn_api_pb2_grpc.py | 17 +++++++++++++++++
.../apache_beam/runners/api/beam_runner_api_pb2.py | 17 +++++++++++++++++
sdks/python/run_pylint.sh | 5 ++++-
sdks/python/setup.py | 1 +
6 files changed, 59 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/fbeb7e13/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5764204..8723ed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1193,6 +1193,9 @@
<exclude>**/.factorypath</exclude>
<exclude>**/.project</exclude>
<exclude>**/.settings/**/*</exclude>
+
+ <!-- Proto/grpc generated wrappers -->
+ <exclude>**/sdks/python/apache_beam/runners/api/*.py</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/beam/blob/fbeb7e13/sdks/python/apache_beam/runners/api/beam_fn_api_pb2.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/api/beam_fn_api_pb2.py b/sdks/python/apache_beam/runners/api/beam_fn_api_pb2.py
index dea47e3..769b13c 100644
--- a/sdks/python/apache_beam/runners/api/beam_fn_api_pb2.py
+++ b/sdks/python/apache_beam/runners/api/beam_fn_api_pb2.py
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: beam_fn_api.proto
http://git-wip-us.apache.org/repos/asf/beam/blob/fbeb7e13/sdks/python/apache_beam/runners/api/beam_fn_api_pb2_grpc.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/api/beam_fn_api_pb2_grpc.py b/sdks/python/apache_beam/runners/api/beam_fn_api_pb2_grpc.py
index f86861c..7fbe4c1 100644
--- a/sdks/python/apache_beam/runners/api/beam_fn_api_pb2_grpc.py
+++ b/sdks/python/apache_beam/runners/api/beam_fn_api_pb2_grpc.py
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
import grpc
from grpc.framework.common import cardinality
http://git-wip-us.apache.org/repos/asf/beam/blob/fbeb7e13/sdks/python/apache_beam/runners/api/beam_runner_api_pb2.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/api/beam_runner_api_pb2.py b/sdks/python/apache_beam/runners/api/beam_runner_api_pb2.py
index 3c612a9..d2006d7 100644
--- a/sdks/python/apache_beam/runners/api/beam_runner_api_pb2.py
+++ b/sdks/python/apache_beam/runners/api/beam_runner_api_pb2.py
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: beam_runner_api.proto
http://git-wip-us.apache.org/repos/asf/beam/blob/fbeb7e13/sdks/python/run_pylint.sh
----------------------------------------------------------------------
diff --git a/sdks/python/run_pylint.sh b/sdks/python/run_pylint.sh
index f733a79..11e0526 100755
--- a/sdks/python/run_pylint.sh
+++ b/sdks/python/run_pylint.sh
@@ -46,7 +46,10 @@ EXCLUDED_GENERATED_FILES=(
"apache_beam/io/gcp/internal/clients/storage/storage_v1_client.py"
"apache_beam/io/gcp/internal/clients/storage/storage_v1_messages.py"
"apache_beam/coders/proto2_coder_test_messages_pb2.py"
-"apache_beam/runners/api/beam_runner_api_pb2.py")
+"apache_beam/runners/api/beam_fn_api_pb2.py"
+"apache_beam/runners/api/beam_fn_api_pb2_grpc.py"
+"apache_beam/runners/api/beam_runner_api_pb2.py"
+)
FILES_TO_IGNORE=""
for file in "${EXCLUDED_GENERATED_FILES[@]}"; do
http://git-wip-us.apache.org/repos/asf/beam/blob/fbeb7e13/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 6c3f426..a6efe21 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -90,6 +90,7 @@ REQUIRED_PACKAGES = [
'avro>=1.8.1,<2.0.0',
'crcmod>=1.7,<2.0',
'dill==0.2.6',
+ 'grpcio>=1.0,<2.0',
'httplib2>=0.8,<0.10',
'mock>=1.0.1,<3.0.0',
'oauth2client>=2.0.1,<4.0.0',