From 635cf80511a29ffc9e1e55feedb45f89c415ea47 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Sat, 10 Oct 2020 05:29:47 -0700 Subject: [PATCH 1/3] changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- google/cloud/bigquery_v2/types/standard_sql.py | 4 ++-- synth.metadata | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/google/cloud/bigquery_v2/types/standard_sql.py b/google/cloud/bigquery_v2/types/standard_sql.py index 72f12f284..5c9bc977f 100644 --- a/google/cloud/bigquery_v2/types/standard_sql.py +++ b/google/cloud/bigquery_v2/types/standard_sql.py @@ -79,7 +79,7 @@ class StandardSqlField(proto.Message): name (str): Optional. The name of this field. Can be absent for struct fields. - type (~.standard_sql.StandardSqlDataType): + type_ (~.standard_sql.StandardSqlDataType): Optional. The type of this parameter. Absent if not explicitly specified (e.g., CREATE FUNCTION statement can omit the return type; in @@ -89,7 +89,7 @@ class StandardSqlField(proto.Message): name = proto.Field(proto.STRING, number=1) - type = proto.Field(proto.MESSAGE, number=2, message=StandardSqlDataType,) + type_ = proto.Field(proto.MESSAGE, number=2, message=StandardSqlDataType,) class StandardSqlStructType(proto.Message): diff --git a/synth.metadata b/synth.metadata index 008810630..658091034 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-bigquery.git", - "sha": "31644d380b35a76a9147801a4b6b0271c246fd0c" + "sha": "35627d145a41d57768f19d4392ef235928e00f72" } }, { @@ -112,7 +112,6 @@ "samples/AUTHORING_GUIDE.md", "samples/CONTRIBUTING.md", "scripts/decrypt-secrets.sh", - "scripts/fixup_bigquery_v2_keywords.py", "scripts/readme-gen/readme_gen.py", "scripts/readme-gen/templates/README.tmpl.rst", "scripts/readme-gen/templates/auth.tmpl.rst", From 9b44eb01398d5e00564f6e350c599d17bd404e92 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Sat, 10 Oct 2020 05:30:11 -0700 Subject: [PATCH 2/3] chore(python): use BUILD_SPECIFIC_GCLOUD_PROJECT for samples https://github.com/googleapis/python-talent/blob/ef045e8eb348db36d7a2a611e6f26b11530d273b/samples/snippets/noxfile_config.py#L27-L32 `BUILD_SPECIFIC_GCLOUD_PROJECT` is an alternate project used for sample tests that do poorly with concurrent runs on the same project. Source-Author: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Source-Date: Wed Sep 30 13:06:03 2020 -0600 Source-Repo: googleapis/synthtool Source-Sha: 9b0da5204ab90bcc36f8cd4e5689eff1a54cc3e4 Source-Link: https://github.com/googleapis/synthtool/commit/9b0da5204ab90bcc36f8cd4e5689eff1a54cc3e4 --- .kokoro/samples/python3.6/common.cfg | 6 ++++++ .kokoro/samples/python3.7/common.cfg | 6 ++++++ .kokoro/samples/python3.8/common.cfg | 6 ++++++ synth.metadata | 4 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.kokoro/samples/python3.6/common.cfg b/.kokoro/samples/python3.6/common.cfg index a56768eae..f3b930960 100644 --- a/.kokoro/samples/python3.6/common.cfg +++ b/.kokoro/samples/python3.6/common.cfg @@ -13,6 +13,12 @@ env_vars: { value: "py-3.6" } +# Declare build specific Cloud project. +env_vars: { + key: "BUILD_SPECIFIC_GCLOUD_PROJECT" + value: "python-docs-samples-tests-py36" +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-bigquery/.kokoro/test-samples.sh" diff --git a/.kokoro/samples/python3.7/common.cfg b/.kokoro/samples/python3.7/common.cfg index c93747180..fc0654565 100644 --- a/.kokoro/samples/python3.7/common.cfg +++ b/.kokoro/samples/python3.7/common.cfg @@ -13,6 +13,12 @@ env_vars: { value: "py-3.7" } +# Declare build specific Cloud project. +env_vars: { + key: "BUILD_SPECIFIC_GCLOUD_PROJECT" + value: "python-docs-samples-tests-py37" +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-bigquery/.kokoro/test-samples.sh" diff --git a/.kokoro/samples/python3.8/common.cfg b/.kokoro/samples/python3.8/common.cfg index 9808f15e3..2b0bf59b3 100644 --- a/.kokoro/samples/python3.8/common.cfg +++ b/.kokoro/samples/python3.8/common.cfg @@ -13,6 +13,12 @@ env_vars: { value: "py-3.8" } +# Declare build specific Cloud project. +env_vars: { + key: "BUILD_SPECIFIC_GCLOUD_PROJECT" + value: "python-docs-samples-tests-py38" +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-bigquery/.kokoro/test-samples.sh" diff --git a/synth.metadata b/synth.metadata index 658091034..a97e296a6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -19,14 +19,14 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f3c04883d6c43261ff13db1f52d03a283be06871" + "sha": "9b0da5204ab90bcc36f8cd4e5689eff1a54cc3e4" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f3c04883d6c43261ff13db1f52d03a283be06871" + "sha": "9b0da5204ab90bcc36f8cd4e5689eff1a54cc3e4" } } ], From 5978ca51d96e5ee3cd76cd8b25096d97e5984bf2 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 13 Oct 2020 14:35:47 -0500 Subject: [PATCH 3/3] update to_standard_sql to support type_ rename --- google/cloud/bigquery/schema.py | 2 +- tests/unit/test_schema.py | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/google/cloud/bigquery/schema.py b/google/cloud/bigquery/schema.py index 8ae0a3a85..a91d0fad8 100644 --- a/google/cloud/bigquery/schema.py +++ b/google/cloud/bigquery/schema.py @@ -241,7 +241,7 @@ def to_standard_sql(self): field.to_standard_sql() for field in self.fields ) - return types.StandardSqlField(name=self.name, type=sql_type) + return types.StandardSqlField(name=self.name, type_=sql_type) def __eq__(self, other): if not isinstance(other, SchemaField): diff --git a/tests/unit/test_schema.py b/tests/unit/test_schema.py index 71bf6b5ae..5a6a27d63 100644 --- a/tests/unit/test_schema.py +++ b/tests/unit/test_schema.py @@ -220,7 +220,7 @@ def test_to_standard_sql_simple_type(self): field = self._make_one("some_field", legacy_type) standard_field = field.to_standard_sql() self.assertEqual(standard_field.name, "some_field") - self.assertEqual(standard_field.type.type_kind, standard_type) + self.assertEqual(standard_field.type_.type_kind, standard_type) def test_to_standard_sql_struct_type(self): from google.cloud.bigquery_v2 import types @@ -258,28 +258,28 @@ def test_to_standard_sql_struct_type(self): # level 2 fields sub_sub_field_date = types.StandardSqlField( - name="date_field", type=sql_type(type_kind=sql_type.TypeKind.DATE) + name="date_field", type_=sql_type(type_kind=sql_type.TypeKind.DATE) ) sub_sub_field_time = types.StandardSqlField( - name="time_field", type=sql_type(type_kind=sql_type.TypeKind.TIME) + name="time_field", type_=sql_type(type_kind=sql_type.TypeKind.TIME) ) # level 1 fields sub_field_struct = types.StandardSqlField( - name="last_used", type=sql_type(type_kind=sql_type.TypeKind.STRUCT) + name="last_used", type_=sql_type(type_kind=sql_type.TypeKind.STRUCT) ) - sub_field_struct.type.struct_type.fields.extend( + sub_field_struct.type_.struct_type.fields.extend( [sub_sub_field_date, sub_sub_field_time] ) sub_field_bytes = types.StandardSqlField( - name="image_content", type=sql_type(type_kind=sql_type.TypeKind.BYTES) + name="image_content", type_=sql_type(type_kind=sql_type.TypeKind.BYTES) ) # level 0 (top level) expected_result = types.StandardSqlField( - name="image_usage", type=sql_type(type_kind=sql_type.TypeKind.STRUCT) + name="image_usage", type_=sql_type(type_kind=sql_type.TypeKind.STRUCT) ) - expected_result.type.struct_type.fields.extend( + expected_result.type_.struct_type.fields.extend( [sub_field_bytes, sub_field_struct] ) @@ -307,7 +307,7 @@ def test_to_standard_sql_array_type_simple(self): expected_sql_type = sql_type(type_kind=sql_type.TypeKind.ARRAY) expected_sql_type.array_element_type.type_kind = sql_type.TypeKind.INT64 expected_result = types.StandardSqlField( - name="valid_numbers", type=expected_sql_type + name="valid_numbers", type_=expected_sql_type ) # construct "repeated" SchemaField object and convert to standard SQL @@ -323,22 +323,22 @@ def test_to_standard_sql_array_type_struct(self): # define person STRUCT name_field = types.StandardSqlField( - name="name", type=sql_type(type_kind=sql_type.TypeKind.STRING) + name="name", type_=sql_type(type_kind=sql_type.TypeKind.STRING) ) age_field = types.StandardSqlField( - name="age", type=sql_type(type_kind=sql_type.TypeKind.INT64) + name="age", type_=sql_type(type_kind=sql_type.TypeKind.INT64) ) person_struct = types.StandardSqlField( - name="person_info", type=sql_type(type_kind=sql_type.TypeKind.STRUCT) + name="person_info", type_=sql_type(type_kind=sql_type.TypeKind.STRUCT) ) - person_struct.type.struct_type.fields.extend([name_field, age_field]) + person_struct.type_.struct_type.fields.extend([name_field, age_field]) # define expected result - an ARRAY of person structs expected_sql_type = sql_type( - type_kind=sql_type.TypeKind.ARRAY, array_element_type=person_struct.type + type_kind=sql_type.TypeKind.ARRAY, array_element_type=person_struct.type_ ) expected_result = types.StandardSqlField( - name="known_people", type=expected_sql_type + name="known_people", type_=expected_sql_type ) # construct legacy repeated SchemaField object @@ -359,7 +359,7 @@ def test_to_standard_sql_unknown_type(self): self.assertEqual(standard_field.name, "weird_field") self.assertEqual( - standard_field.type.type_kind, sql_type.TypeKind.TYPE_KIND_UNSPECIFIED + standard_field.type_.type_kind, sql_type.TypeKind.TYPE_KIND_UNSPECIFIED ) def test___eq___wrong_type(self):