Skip to content

Commit 61634be

Browse files
authored
docs: update snippets samples to support version 2.0 (#309)
* docs: update snippets samples to support version 2.0 For some reason, old versions of the google-cloud-bigquery-storage library were still getting used. This pins those dependencies directly, instead. Also, updates the samples to remove warnings about `client.dataset`. * blacken
1 parent 1a4dc12 commit 61634be

6 files changed

+25
-11
lines changed

samples/snippets/authorized_view_tutorial.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@ def run_authorized_view_tutorial(override_values={}):
2727

2828
client = bigquery.Client()
2929
source_dataset_id = "github_source_data"
30+
source_dataset_id_full = "{}.{}".format(client.project, source_dataset_id)
3031

3132
# [END bigquery_authorized_view_tutorial]
3233
# [END bigquery_avt_create_source_dataset]
3334
# To facilitate testing, we replace values with alternatives
3435
# provided by the testing harness.
3536
source_dataset_id = override_values.get("source_dataset_id", source_dataset_id)
37+
source_dataset_id_full = "{}.{}".format(client.project, source_dataset_id)
3638
# [START bigquery_authorized_view_tutorial]
3739
# [START bigquery_avt_create_source_dataset]
3840

39-
source_dataset = bigquery.Dataset(client.dataset(source_dataset_id))
41+
source_dataset = bigquery.Dataset(source_dataset_id_full)
4042
# Specify the geographic location where the dataset should reside.
4143
source_dataset.location = "US"
4244
source_dataset = client.create_dataset(source_dataset) # API request
@@ -66,16 +68,18 @@ def run_authorized_view_tutorial(override_values={}):
6668
# Create a separate dataset to store your view
6769
# [START bigquery_avt_create_shared_dataset]
6870
shared_dataset_id = "shared_views"
71+
shared_dataset_id_full = "{}.{}".format(client.project, shared_dataset_id)
6972

7073
# [END bigquery_authorized_view_tutorial]
7174
# [END bigquery_avt_create_shared_dataset]
7275
# To facilitate testing, we replace values with alternatives
7376
# provided by the testing harness.
7477
shared_dataset_id = override_values.get("shared_dataset_id", shared_dataset_id)
78+
shared_dataset_id_full = "{}.{}".format(client.project, shared_dataset_id)
7579
# [START bigquery_authorized_view_tutorial]
7680
# [START bigquery_avt_create_shared_dataset]
7781

78-
shared_dataset = bigquery.Dataset(client.dataset(shared_dataset_id))
82+
shared_dataset = bigquery.Dataset(shared_dataset_id_full)
7983
shared_dataset.location = "US"
8084
shared_dataset = client.create_dataset(shared_dataset) # API request
8185
# [END bigquery_avt_create_shared_dataset]

samples/snippets/authorized_view_tutorial_test.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def datasets_to_delete(client):
3030
doomed = []
3131
yield doomed
3232
for item in doomed:
33-
client.delete_dataset(item, delete_contents=True)
33+
client.delete_dataset(item, delete_contents=True, not_found_ok=True)
3434

3535

3636
def test_authorized_view_tutorial(client, datasets_to_delete):
@@ -42,8 +42,12 @@ def test_authorized_view_tutorial(client, datasets_to_delete):
4242
str(uuid.uuid4()).replace("-", "_")
4343
),
4444
}
45-
source_dataset_ref = client.dataset(override_values["source_dataset_id"])
46-
shared_dataset_ref = client.dataset(override_values["shared_dataset_id"])
45+
source_dataset_ref = "{}.{}".format(
46+
client.project, override_values["source_dataset_id"]
47+
)
48+
shared_dataset_ref = "{}.{}".format(
49+
client.project, override_values["shared_dataset_id"]
50+
)
4751
datasets_to_delete.extend(
4852
[override_values["source_dataset_id"], override_values["shared_dataset_id"]]
4953
)

samples/snippets/natality_tutorial.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ def run_natality_tutorial(override_values={}):
3838

3939
# Prepare a reference to a new dataset for storing the query results.
4040
dataset_id = "natality_regression"
41+
dataset_id_full = "{}.{}".format(client.project, dataset_id)
4142
# [END bigquery_query_natality_tutorial]
4243
# To facilitate testing, we replace values with alternatives
4344
# provided by the testing harness.
4445
dataset_id = override_values.get("dataset_id", dataset_id)
46+
dataset_id_full = "{}.{}".format(client.project, dataset_id)
4547
# [START bigquery_query_natality_tutorial]
4648

47-
dataset = bigquery.Dataset(client.dataset(dataset_id))
49+
dataset = bigquery.Dataset(dataset_id_full)
4850

4951
# Create the new BigQuery dataset.
5052
dataset = client.create_dataset(dataset)

samples/snippets/natality_tutorial_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def test_natality_tutorial(client, datasets_to_delete):
4343

4444
natality_tutorial.run_natality_tutorial(override_values)
4545

46-
table_ref = bigquery.Dataset(client.dataset(override_values["dataset_id"])).table(
47-
"regression_input"
46+
table_ref = "{}.{}.{}".format(
47+
client.project, override_values["dataset_id"], "regression_input"
4848
)
4949
table = client.get_table(table_ref)
5050
assert table.num_rows > 0

samples/snippets/quickstart.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def run_quickstart(override_values={}):
3333
# [START bigquery_quickstart]
3434

3535
# Prepares a reference to the new dataset
36-
dataset_ref = bigquery_client.dataset(dataset_id)
37-
dataset = bigquery.Dataset(dataset_ref)
36+
dataset_id_full = "{}.{}".format(bigquery_client.project, dataset_id)
37+
dataset = bigquery.Dataset(dataset_id_full)
3838

3939
# Creates the new dataset
4040
dataset = bigquery_client.create_dataset(dataset)

samples/snippets/requirements.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
google-cloud-bigquery[pandas,bqstorage,pyarrow]==2.0.0
1+
google-cloud-bigquery==2.0.0
2+
google-cloud-bigquery-storage==2.0.0
23
google-auth-oauthlib==0.4.1
4+
grpcio==1.32.0
35
ipython==7.16.1; python_version < '3.7'
46
ipython==7.17.0; python_version >= '3.7'
57
matplotlib==3.3.1
8+
pandas==1.1.3
9+
pyarrow==1.0.1
610
pytz==2020.1

0 commit comments

Comments
 (0)