Move to google-cloud [(googleapis#544)](GoogleCloudPlatform/python-do…

…cs-samples#544)
busunkim96 · Sep 30, 2016 · 3deaab3 · 3deaab3
1 parent 0d4bd55
commit 3deaab3
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 68 deletions.
diff --git a/samples/hello/main.py b/samples/hello/main.py
@@ -26,79 +26,79 @@
 
 import argparse
 
-from gcloud import bigtable
+from google.cloud import bigtable
 
 
 def main(project_id, instance_id, table_id):
     # [START connecting_to_bigtable]
     # The client must be created with admin=True because it will create a
     # table.
-    with bigtable.Client(project=project_id, admin=True) as client:
-        instance = client.instance(instance_id)
-        # [END connecting_to_bigtable]
-
-        # [START creating_a_table]
-        print('Creating the {} table.'.format(table_id))
-        table = instance.table(table_id)
-        table.create()
-        column_family_id = 'cf1'
-        cf1 = table.column_family(column_family_id)
-        cf1.create()
-        # [END creating_a_table]
-
-        # [START writing_rows]
-        print('Writing some greetings to the table.')
-        column_id = 'greeting'.encode('utf-8')
-        greetings = [
-            'Hello World!',
-            'Hello Cloud Bigtable!',
-            'Hello Python!',
-        ]
-
-        for i, value in enumerate(greetings):
-            # Note: This example uses sequential numeric IDs for simplicity,
-            # but this can result in poor performance in a production
-            # application.  Since rows are stored in sorted order by key,
-            # sequential keys can result in poor distribution of operations
-            # across nodes.
-            #
-            # For more information about how to design a Bigtable schema for
-            # the best performance, see the documentation:
-            #
-            #     https://cloud.google.com/bigtable/docs/schema-design
-            row_key = 'greeting{}'.format(i)
-            row = table.row(row_key)
-            row.set_cell(
-                column_family_id,
-                column_id,
-                value.encode('utf-8'))
-            row.commit()
-        # [END writing_rows]
-
-        # [START getting_a_row]
-        print('Getting a single greeting by row key.')
-        key = 'greeting0'
-        row = table.read_row(key.encode('utf-8'))
-        value = row.cells[column_family_id][column_id][0].value
-        print('\t{}: {}'.format(key, value.decode('utf-8')))
-        # [END getting_a_row]
-
-        # [START scanning_all_rows]
-        print('Scanning for all greetings:')
-        partial_rows = table.read_rows()
-        partial_rows.consume_all()
-
-        for row_key, row in partial_rows.rows.items():
-            key = row_key.decode('utf-8')
-            cell = row.cells[column_family_id][column_id][0]
-            value = cell.value.decode('utf-8')
-            print('\t{}: {}'.format(key, value))
-        # [END scanning_all_rows]
-
-        # [START deleting_a_table]
-        print('Deleting the {} table.'.format(table_id))
-        table.delete()
-        # [END deleting_a_table]
+    client = bigtable.Client(project=project_id, admin=True)
+    instance = client.instance(instance_id)
+    # [END connecting_to_bigtable]
+
+    # [START creating_a_table]
+    print('Creating the {} table.'.format(table_id))
+    table = instance.table(table_id)
+    table.create()
+    column_family_id = 'cf1'
+    cf1 = table.column_family(column_family_id)
+    cf1.create()
+    # [END creating_a_table]
+
+    # [START writing_rows]
+    print('Writing some greetings to the table.')
+    column_id = 'greeting'.encode('utf-8')
+    greetings = [
+        'Hello World!',
+        'Hello Cloud Bigtable!',
+        'Hello Python!',
+    ]
+
+    for i, value in enumerate(greetings):
+        # Note: This example uses sequential numeric IDs for simplicity,
+        # but this can result in poor performance in a production
+        # application.  Since rows are stored in sorted order by key,
+        # sequential keys can result in poor distribution of operations
+        # across nodes.
+        #
+        # For more information about how to design a Bigtable schema for
+        # the best performance, see the documentation:
+        #
+        #     https://cloud.google.com/bigtable/docs/schema-design
+        row_key = 'greeting{}'.format(i)
+        row = table.row(row_key)
+        row.set_cell(
+            column_family_id,
+            column_id,
+            value.encode('utf-8'))
+        row.commit()
+    # [END writing_rows]
+
+    # [START getting_a_row]
+    print('Getting a single greeting by row key.')
+    key = 'greeting0'
+    row = table.read_row(key.encode('utf-8'))
+    value = row.cells[column_family_id][column_id][0].value
+    print('\t{}: {}'.format(key, value.decode('utf-8')))
+    # [END getting_a_row]
+
+    # [START scanning_all_rows]
+    print('Scanning for all greetings:')
+    partial_rows = table.read_rows()
+    partial_rows.consume_all()
+
+    for row_key, row in partial_rows.rows.items():
+        key = row_key.decode('utf-8')
+        cell = row.cells[column_family_id][column_id][0]
+        value = cell.value.decode('utf-8')
+        print('\t{}: {}'.format(key, value))
+    # [END scanning_all_rows]
+
+    # [START deleting_a_table]
+    print('Deleting the {} table.'.format(table_id))
+    table.delete()
+    # [END deleting_a_table]
 
 
 if __name__ == '__main__':

diff --git a/samples/hello/requirements.txt b/samples/hello/requirements.txt
@@ -1 +1 @@
-gcloud[grpc]==0.18.3
+google-cloud-bigtable==0.20.0