beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From al...@apache.org
Subject [1/2] beam git commit: Upgrading to datatore 0.7.0 library
Date Tue, 14 Feb 2017 02:40:01 GMT
Repository: beam
Updated Branches:
  refs/heads/master 4018c835c -> f32cb3e7a


Upgrading to datatore 0.7.0 library


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

Branch: refs/heads/master
Commit: d8201a93c7776dbd0e77b4f428fb14a9840dd18a
Parents: 4018c83
Author: Ahmet Altay <altay@google.com>
Authored: Fri Feb 10 19:02:25 2017 -0800
Committer: Ahmet Altay <altay@google.com>
Committed: Mon Feb 13 18:25:38 2017 -0800

----------------------------------------------------------------------
 .../apache_beam/examples/cookbook/datastore_wordcount.py     | 6 +++---
 sdks/python/apache_beam/examples/snippets/snippets.py        | 4 ++--
 sdks/python/apache_beam/io/datastore/v1/datastoreio.py       | 2 +-
 sdks/python/apache_beam/io/datastore/v1/datastoreio_test.py  | 4 ++--
 sdks/python/apache_beam/io/datastore/v1/fake_datastore.py    | 4 ++--
 sdks/python/apache_beam/io/datastore/v1/helper.py            | 6 +++---
 sdks/python/apache_beam/io/datastore/v1/helper_test.py       | 8 ++++----
 sdks/python/apache_beam/io/datastore/v1/query_splitter.py    | 8 ++++----
 .../apache_beam/io/datastore/v1/query_splitter_test.py       | 6 +++---
 sdks/python/setup.py                                         | 5 +++--
 10 files changed, 27 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/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 282afbf..5d3bef6 100644
--- a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
+++ b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
@@ -35,7 +35,7 @@ The following options must be provided to run this pipeline in read-only
mode:
 --project YOUR_PROJECT_ID
 --kind YOUR_DATASTORE_KIND
 --output [YOUR_LOCAL_FILE *or* gs://YOUR_OUTPUT_PATH]
---read-only
+--read_only
 ``
 
 Read-write Mode: In this mode, this example reads words from an input file,
@@ -66,8 +66,8 @@ import logging
 import re
 import uuid
 
-from google.datastore.v1 import entity_pb2
-from google.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1 import entity_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
 from googledatastore import helper as datastore_helper, PropertyFilter
 
 import apache_beam as beam

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/examples/snippets/snippets.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/snippets/snippets.py b/sdks/python/apache_beam/examples/snippets/snippets.py
index 9ba46cd..6f081df 100644
--- a/sdks/python/apache_beam/examples/snippets/snippets.py
+++ b/sdks/python/apache_beam/examples/snippets/snippets.py
@@ -862,8 +862,8 @@ def model_datastoreio():
   """Using a Read and Write transform to read/write to Cloud Datastore."""
 
   import uuid
-  from google.datastore.v1 import entity_pb2
-  from google.datastore.v1 import query_pb2
+  from google.cloud.proto.datastore.v1 import entity_pb2
+  from google.cloud.proto.datastore.v1 import query_pb2
   import googledatastore
   import apache_beam as beam
   from apache_beam.utils.pipeline_options import PipelineOptions

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/datastoreio.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/datastoreio.py b/sdks/python/apache_beam/io/datastore/v1/datastoreio.py
index 5f6663a..562d88e 100644
--- a/sdks/python/apache_beam/io/datastore/v1/datastoreio.py
+++ b/sdks/python/apache_beam/io/datastore/v1/datastoreio.py
@@ -19,7 +19,7 @@
 
 import logging
 
-from google.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import datastore_pb2
 from googledatastore import helper as datastore_helper
 
 from apache_beam.io.datastore.v1 import helper

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/datastoreio_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/datastoreio_test.py b/sdks/python/apache_beam/io/datastore/v1/datastoreio_test.py
index cdaccb1..3bd4630 100644
--- a/sdks/python/apache_beam/io/datastore/v1/datastoreio_test.py
+++ b/sdks/python/apache_beam/io/datastore/v1/datastoreio_test.py
@@ -17,8 +17,8 @@
 
 import unittest
 
-from google.datastore.v1 import datastore_pb2
-from google.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
 from google.protobuf import timestamp_pb2
 from googledatastore import helper as datastore_helper
 from mock import MagicMock, call, patch

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/fake_datastore.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/fake_datastore.py b/sdks/python/apache_beam/io/datastore/v1/fake_datastore.py
index af2c4c1..ac8e0e0 100644
--- a/sdks/python/apache_beam/io/datastore/v1/fake_datastore.py
+++ b/sdks/python/apache_beam/io/datastore/v1/fake_datastore.py
@@ -18,8 +18,8 @@
 """Fake datastore used for unit testing."""
 import uuid
 
-from google.datastore.v1 import datastore_pb2
-from google.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
 
 
 def create_run_query(entities, batch_size):

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/helper.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/helper.py b/sdks/python/apache_beam/io/datastore/v1/helper.py
index 521fb68..1497862 100644
--- a/sdks/python/apache_beam/io/datastore/v1/helper.py
+++ b/sdks/python/apache_beam/io/datastore/v1/helper.py
@@ -18,9 +18,9 @@
 """Cloud Datastore helper functions."""
 import sys
 
-from google.datastore.v1 import datastore_pb2
-from google.datastore.v1 import entity_pb2
-from google.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import entity_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
 from googledatastore import PropertyFilter, CompositeFilter
 from googledatastore import helper as datastore_helper
 from googledatastore.connection import Datastore

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/helper_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/helper_test.py b/sdks/python/apache_beam/io/datastore/v1/helper_test.py
index 051d150..87bf05d 100644
--- a/sdks/python/apache_beam/io/datastore/v1/helper_test.py
+++ b/sdks/python/apache_beam/io/datastore/v1/helper_test.py
@@ -19,10 +19,10 @@
 import sys
 import unittest
 
-from google.datastore.v1 import datastore_pb2
-from google.datastore.v1 import entity_pb2
-from google.datastore.v1 import query_pb2
-from google.datastore.v1.entity_pb2 import Key
+from google.cloud.proto.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import entity_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1.entity_pb2 import Key
 from googledatastore.connection import RPCError
 from googledatastore import helper as datastore_helper
 from mock import MagicMock

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/query_splitter.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/query_splitter.py b/sdks/python/apache_beam/io/datastore/v1/query_splitter.py
index 98a8786..3753700 100644
--- a/sdks/python/apache_beam/io/datastore/v1/query_splitter.py
+++ b/sdks/python/apache_beam/io/datastore/v1/query_splitter.py
@@ -18,10 +18,10 @@
 """Implements a Cloud Datastore query splitter."""
 
 from apache_beam.io.datastore.v1 import helper
-from google.datastore.v1 import datastore_pb2
-from google.datastore.v1 import query_pb2
-from google.datastore.v1.query_pb2 import PropertyFilter
-from google.datastore.v1.query_pb2 import CompositeFilter
+from google.cloud.proto.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1.query_pb2 import PropertyFilter
+from google.cloud.proto.datastore.v1.query_pb2 import CompositeFilter
 from googledatastore import helper as datastore_helper
 
 

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/apache_beam/io/datastore/v1/query_splitter_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/datastore/v1/query_splitter_test.py b/sdks/python/apache_beam/io/datastore/v1/query_splitter_test.py
index 810719b..6156afa 100644
--- a/sdks/python/apache_beam/io/datastore/v1/query_splitter_test.py
+++ b/sdks/python/apache_beam/io/datastore/v1/query_splitter_test.py
@@ -25,9 +25,9 @@ from mock import call
 from apache_beam.io.datastore.v1 import fake_datastore
 from apache_beam.io.datastore.v1 import query_splitter
 
-from google.datastore.v1 import datastore_pb2
-from google.datastore.v1 import query_pb2
-from google.datastore.v1.query_pb2 import PropertyFilter
+from google.cloud.proto.datastore.v1 import datastore_pb2
+from google.cloud.proto.datastore.v1 import query_pb2
+from google.cloud.proto.datastore.v1.query_pb2 import PropertyFilter
 
 
 class QuerySplitterTest(unittest.TestCase):

http://git-wip-us.apache.org/repos/asf/beam/blob/d8201a93/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 44c2ab6..90a4e53 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -87,11 +87,12 @@ REQUIRED_PACKAGES = [
     'crcmod>=1.7,<2.0',
     'dill>=0.2.5,<0.3',
     'google-apitools>=0.5.6,<1.0.0',
-    'googledatastore==6.4.1',
+    'proto-google-cloud-datastore-v1==0.90.0',
+    'googledatastore==7.0.0',
     'httplib2>=0.8,<0.10',
     'mock>=1.0.1,<3.0.0',
     'oauth2client>=2.0.1,<4.0.0',
-    'protobuf==3.0.0',
+    'protobuf==3.2.0',
     'protorpc>=0.9.1,<0.12',
     'python-gflags>=2.0,<4.0.0',
     'pyyaml>=3.10,<4.0.0',


Mime
View raw message