You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/06/17 01:14:57 UTC

[1/2] incubator-beam git commit: Closes #480

Repository: incubator-beam
Updated Branches:
  refs/heads/python-sdk cd0f50980 -> 20687e83a


Closes #480


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

Branch: refs/heads/python-sdk
Commit: 20687e83a2e05d1cb8f9d952b3b2d0acf08ec739
Parents: cd0f509 09f3faa
Author: Dan Halperin <dh...@google.com>
Authored: Thu Jun 16 18:14:08 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jun 16 18:14:08 2016 -0700

----------------------------------------------------------------------
 sdks/python/.travis.yml                         |  7 ------
 sdks/python/CONTRIBUTING.md                     | 26 --------------------
 sdks/python/README.md                           | 19 ++++++++++++++
 sdks/python/apache_beam/examples/__init__.py    | 16 ++++++++++++
 .../complete/juliaset/juliaset/__init__.py      | 16 ++++++++++++
 .../examples/complete/juliaset/setup.py         | 13 ++++++----
 sdks/python/apache_beam/internal/__init__.py    | 16 ++++++++++++
 .../apache_beam/internal/clients/__init__.py    | 16 ++++++++++++
 .../internal/clients/bigquery/__init__.py       | 17 +++++++++++++
 .../clients/bigquery/bigquery_v2_client.py      | 17 +++++++++++++
 .../clients/bigquery/bigquery_v2_messages.py    | 17 +++++++++++++
 .../internal/clients/dataflow/__init__.py       | 17 +++++++++++++
 .../clients/dataflow/dataflow_v1b3_client.py    | 17 +++++++++++++
 .../clients/dataflow/dataflow_v1b3_messages.py  | 17 +++++++++++++
 .../internal/clients/storage/__init__.py        | 17 +++++++++++++
 .../clients/storage/storage_v1_client.py        | 17 +++++++++++++
 .../clients/storage/storage_v1_messages.py      | 17 +++++++++++++
 sdks/python/apache_beam/python_sdk_releases.py  | 13 ++++++----
 sdks/python/apache_beam/runners/common.pxd      | 15 ++++++-----
 sdks/python/apache_beam/runners/common.py       | 15 ++++++-----
 .../transforms/trigger_transcripts.yaml         | 17 +++++++++++++
 sdks/python/apache_beam/typehints/opcodes.py    | 13 ++++++----
 .../apache_beam/typehints/trivial_inference.py  | 13 ++++++----
 .../typehints/trivial_inference_test.py         | 13 ++++++----
 sdks/python/apache_beam/utils/counters.pxd      | 15 ++++++-----
 sdks/python/apache_beam/utils/counters.py       | 15 ++++++-----
 sdks/python/setup.cfg                           | 17 +++++++++++++
 sdks/python/tox.ini                             |  7 ------
 28 files changed, 346 insertions(+), 89 deletions(-)
----------------------------------------------------------------------



[2/2] incubator-beam git commit: Fix the licenses (add or update)

Posted by dh...@apache.org.
Fix the licenses (add or update)


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

Branch: refs/heads/python-sdk
Commit: 09f3faa4476165a2730d19f54ad032c3ca99ce06
Parents: cd0f509
Author: Ahmet Altay <al...@google.com>
Authored: Thu Jun 16 12:59:32 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jun 16 18:14:08 2016 -0700

----------------------------------------------------------------------
 sdks/python/.travis.yml                         |  7 ------
 sdks/python/CONTRIBUTING.md                     | 26 --------------------
 sdks/python/README.md                           | 19 ++++++++++++++
 sdks/python/apache_beam/examples/__init__.py    | 16 ++++++++++++
 .../complete/juliaset/juliaset/__init__.py      | 16 ++++++++++++
 .../examples/complete/juliaset/setup.py         | 13 ++++++----
 sdks/python/apache_beam/internal/__init__.py    | 16 ++++++++++++
 .../apache_beam/internal/clients/__init__.py    | 16 ++++++++++++
 .../internal/clients/bigquery/__init__.py       | 17 +++++++++++++
 .../clients/bigquery/bigquery_v2_client.py      | 17 +++++++++++++
 .../clients/bigquery/bigquery_v2_messages.py    | 17 +++++++++++++
 .../internal/clients/dataflow/__init__.py       | 17 +++++++++++++
 .../clients/dataflow/dataflow_v1b3_client.py    | 17 +++++++++++++
 .../clients/dataflow/dataflow_v1b3_messages.py  | 17 +++++++++++++
 .../internal/clients/storage/__init__.py        | 17 +++++++++++++
 .../clients/storage/storage_v1_client.py        | 17 +++++++++++++
 .../clients/storage/storage_v1_messages.py      | 17 +++++++++++++
 sdks/python/apache_beam/python_sdk_releases.py  | 13 ++++++----
 sdks/python/apache_beam/runners/common.pxd      | 15 ++++++-----
 sdks/python/apache_beam/runners/common.py       | 15 ++++++-----
 .../transforms/trigger_transcripts.yaml         | 17 +++++++++++++
 sdks/python/apache_beam/typehints/opcodes.py    | 13 ++++++----
 .../apache_beam/typehints/trivial_inference.py  | 13 ++++++----
 .../typehints/trivial_inference_test.py         | 13 ++++++----
 sdks/python/apache_beam/utils/counters.pxd      | 15 ++++++-----
 sdks/python/apache_beam/utils/counters.py       | 15 ++++++-----
 sdks/python/setup.cfg                           | 17 +++++++++++++
 sdks/python/tox.ini                             |  7 ------
 28 files changed, 346 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/.travis.yml
----------------------------------------------------------------------
diff --git a/sdks/python/.travis.yml b/sdks/python/.travis.yml
deleted file mode 100644
index 9ee9652..0000000
--- a/sdks/python/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: python
-sudo: false
-env:
-  - TOX_ENV=py27
-install:
-  - pip install tox
-script: tox -e $TOX_ENV

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/sdks/python/CONTRIBUTING.md b/sdks/python/CONTRIBUTING.md
deleted file mode 100644
index f05cf8e..0000000
--- a/sdks/python/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Want to contribute? Great! First, read this page (including the small print at
-the end).
-
-### Before you contribute
-Before we can use your code, you must sign the
-[Google Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual?csw=1)
-(CLA), which you can do online. The CLA is necessary mainly because you own the
-copyright to your changes, even after your contribution becomes part of our
-codebase, so we need your permission to use and distribute your code. We also
-need to be sure of various other things. For instance that you'll tell us if you
-know that your code infringes on other people's patents. You don't have to sign
-the CLA until after you've submitted your code for review and a member has
-approved it, but you must do it before we can put your code into our codebase.
-
-Before you start working on a larger contribution, we recommend to get in touch
-with us first through the issue tracker with your idea so that we can help out
-and possibly guide you. Coordinating up front makes it much easier to avoid
-frustration later on.
-
-### Code reviews
-All submissions, including submissions by project members, require review. We
-use Github pull requests for this purpose.
-
-### The small print
-Contributions made by corporations are covered by a different agreement from
-the one above, the Software Grant and Corporate Contributor License Agreement.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/README.md
----------------------------------------------------------------------
diff --git a/sdks/python/README.md b/sdks/python/README.md
index 5d360b7..d96e467 100644
--- a/sdks/python/README.md
+++ b/sdks/python/README.md
@@ -1,3 +1,22 @@
+<!--
+    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.
+-->
+
 # Cloud Dataflow SDK for Python
 
 [Google Cloud Dataflow](https://cloud.google.com/dataflow/)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/examples/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/__init__.py b/sdks/python/apache_beam/examples/__init__.py
index e69de29..cce3aca 100644
--- a/sdks/python/apache_beam/examples/__init__.py
+++ b/sdks/python/apache_beam/examples/__init__.py
@@ -0,0 +1,16 @@
+#
+# 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.
+#

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
index e69de29..cce3aca 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
@@ -0,0 +1,16 @@
+#
+# 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.
+#

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/examples/complete/juliaset/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/complete/juliaset/setup.py b/sdks/python/apache_beam/examples/complete/juliaset/setup.py
index 91d6588..639e424 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/setup.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/setup.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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.
+#
 
 """Setup.py module for the workflow's worker utilities.
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/__init__.py b/sdks/python/apache_beam/internal/__init__.py
index e69de29..cce3aca 100644
--- a/sdks/python/apache_beam/internal/__init__.py
+++ b/sdks/python/apache_beam/internal/__init__.py
@@ -0,0 +1,16 @@
+#
+# 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.
+#

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/__init__.py b/sdks/python/apache_beam/internal/clients/__init__.py
index e69de29..cce3aca 100644
--- a/sdks/python/apache_beam/internal/clients/__init__.py
+++ b/sdks/python/apache_beam/internal/clients/__init__.py
@@ -0,0 +1,16 @@
+#
+# 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.
+#

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/bigquery/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/bigquery/__init__.py b/sdks/python/apache_beam/internal/clients/bigquery/__init__.py
index cee09e7..326920c 100644
--- a/sdks/python/apache_beam/internal/clients/bigquery/__init__.py
+++ b/sdks/python/apache_beam/internal/clients/bigquery/__init__.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.
+#
+
 """Common imports for generated bigquery client library."""
 # pylint:disable=wildcard-import
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_client.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_client.py b/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_client.py
index 488bad9..61e3aab 100644
--- a/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_client.py
+++ b/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_client.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 client library for bigquery version v2."""
 # NOTE: This file is autogenerated and should not be edited by hand.
 from apitools.base.py import base_api

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_messages.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_messages.py b/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_messages.py
index 36e16c0..4045428 100644
--- a/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_messages.py
+++ b/sdks/python/apache_beam/internal/clients/bigquery/bigquery_v2_messages.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 message classes for bigquery version v2.
 
 A data platform for customers to create, manage, share and query data.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/dataflow/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/dataflow/__init__.py b/sdks/python/apache_beam/internal/clients/dataflow/__init__.py
index 57e50ea..605aa17 100644
--- a/sdks/python/apache_beam/internal/clients/dataflow/__init__.py
+++ b/sdks/python/apache_beam/internal/clients/dataflow/__init__.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.
+#
+
 """Common imports for generated dataflow client library."""
 # pylint:disable=wildcard-import
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_client.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_client.py b/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_client.py
index 6260402..1416638 100644
--- a/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_client.py
+++ b/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_client.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 client library for dataflow version v1b3."""
 # NOTE: This file is autogenerated and should not be edited by hand.
 from apitools.base.py import base_api

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_messages.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_messages.py b/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_messages.py
index 2e0273f..8851231 100644
--- a/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_messages.py
+++ b/sdks/python/apache_beam/internal/clients/dataflow/dataflow_v1b3_messages.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 message classes for dataflow version v1b3.
 
 Develops and executes data processing patterns like ETL, batch computation,

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/storage/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/storage/__init__.py b/sdks/python/apache_beam/internal/clients/storage/__init__.py
index d0dea93..e4650e8 100644
--- a/sdks/python/apache_beam/internal/clients/storage/__init__.py
+++ b/sdks/python/apache_beam/internal/clients/storage/__init__.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.
+#
+
 """Common imports for generated storage client library."""
 # pylint:disable=wildcard-import
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/storage/storage_v1_client.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/storage/storage_v1_client.py b/sdks/python/apache_beam/internal/clients/storage/storage_v1_client.py
index 6642bf3..ae851b1 100644
--- a/sdks/python/apache_beam/internal/clients/storage/storage_v1_client.py
+++ b/sdks/python/apache_beam/internal/clients/storage/storage_v1_client.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 client library for storage version v1."""
 # NOTE: This file is autogenerated and should not be edited by hand.
 from apitools.base.py import base_api

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/internal/clients/storage/storage_v1_messages.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/internal/clients/storage/storage_v1_messages.py b/sdks/python/apache_beam/internal/clients/storage/storage_v1_messages.py
index a565acf..dc9e5e6 100644
--- a/sdks/python/apache_beam/internal/clients/storage/storage_v1_messages.py
+++ b/sdks/python/apache_beam/internal/clients/storage/storage_v1_messages.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 message classes for storage version v1.
 
 Stores and retrieves potentially large, immutable data objects.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/python_sdk_releases.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/python_sdk_releases.py b/sdks/python/apache_beam/python_sdk_releases.py
index 52e07aa..94a0308 100644
--- a/sdks/python/apache_beam/python_sdk_releases.py
+++ b/sdks/python/apache_beam/python_sdk_releases.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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.
+#
 
 """Descriptions of the versions of the SDK.
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/runners/common.pxd
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/common.pxd b/sdks/python/apache_beam/runners/common.pxd
index fa1e3d6..480c056 100644
--- a/sdks/python/apache_beam/runners/common.pxd
+++ b/sdks/python/apache_beam/runners/common.pxd
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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,
+# 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.
+#
 
 cdef type SideOutputValue, TimestampedValue, WindowedValue
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/runners/common.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/common.py b/sdks/python/apache_beam/runners/common.py
index ec591c2..0e4a057 100644
--- a/sdks/python/apache_beam/runners/common.py
+++ b/sdks/python/apache_beam/runners/common.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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,
+# 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.
+#
 
 # cython: profile=True
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/transforms/trigger_transcripts.yaml
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/transforms/trigger_transcripts.yaml b/sdks/python/apache_beam/transforms/trigger_transcripts.yaml
index 91d88bf..f87cd1d 100644
--- a/sdks/python/apache_beam/transforms/trigger_transcripts.yaml
+++ b/sdks/python/apache_beam/transforms/trigger_transcripts.yaml
@@ -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.
+#
+
 name: fixed_default
 window_fn: FixedWindows(10)       # Python names/syntax, unless otherwise noted.
 trigger_fn: Default               # Same. Empty () may be omitted.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/typehints/opcodes.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/typehints/opcodes.py b/sdks/python/apache_beam/typehints/opcodes.py
index 9b5fd52..3cc0a4b 100644
--- a/sdks/python/apache_beam/typehints/opcodes.py
+++ b/sdks/python/apache_beam/typehints/opcodes.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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.
+#
 
 """Defines the actions various bytecodes have on the frame.
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/typehints/trivial_inference.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/typehints/trivial_inference.py b/sdks/python/apache_beam/typehints/trivial_inference.py
index b37ec22..55d580d 100644
--- a/sdks/python/apache_beam/typehints/trivial_inference.py
+++ b/sdks/python/apache_beam/typehints/trivial_inference.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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.
+#
 
 """Trivial type inference for simple functions.
 """

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/typehints/trivial_inference_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/typehints/trivial_inference_test.py b/sdks/python/apache_beam/typehints/trivial_inference_test.py
index 4f7a3f1..a94acf5 100644
--- a/sdks/python/apache_beam/typehints/trivial_inference_test.py
+++ b/sdks/python/apache_beam/typehints/trivial_inference_test.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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.
+#
 
 """Tests for apache_beam.typehints.trivial_inference."""
 import unittest

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/utils/counters.pxd
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/utils/counters.pxd b/sdks/python/apache_beam/utils/counters.pxd
index 8c5f0b7..b8addb2 100644
--- a/sdks/python/apache_beam/utils/counters.pxd
+++ b/sdks/python/apache_beam/utils/counters.pxd
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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,
+# 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.
+#
 
 # cython: profile=True
 # cython: overflowcheck=True

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/apache_beam/utils/counters.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/utils/counters.py b/sdks/python/apache_beam/utils/counters.py
index e4afcb8..f6b432a 100644
--- a/sdks/python/apache_beam/utils/counters.py
+++ b/sdks/python/apache_beam/utils/counters.py
@@ -1,16 +1,19 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed 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
+# 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
+#    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,
+# 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.
+#
 
 # cython: profile=False
 # cython: overflowcheck=True

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/setup.cfg
----------------------------------------------------------------------
diff --git a/sdks/python/setup.cfg b/sdks/python/setup.cfg
index 58e2cae..5b58e8d 100644
--- a/sdks/python/setup.cfg
+++ b/sdks/python/setup.cfg
@@ -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.
+#
+
 [nosetests]
 # Allow discovery of Python test files marked executable.
 exe=True

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09f3faa4/sdks/python/tox.ini
----------------------------------------------------------------------
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
deleted file mode 100644
index c7f39d2..0000000
--- a/sdks/python/tox.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[tox]
-envlist = py27
-
-[testenv:py27]
-commands =
-  python setup.py test
-passenv = TRAVIS*