From 2c7432393f1f410508b2a275813e4feb3f8b3cef Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 21 Aug 2019 16:05:09 -0700 Subject: [PATCH 1/4] Add BigQuery to extra test dependencies. --- bigquery_storage/synth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigquery_storage/synth.py b/bigquery_storage/synth.py index 240da340eea3..da38790581d6 100644 --- a/bigquery_storage/synth.py +++ b/bigquery_storage/synth.py @@ -122,7 +122,7 @@ # ---------------------------------------------------------------------------- # Add templated files # ---------------------------------------------------------------------------- -extra_deps = [".[fastavro,pandas,pyarrow]"] +extra_deps = [".[fastavro,pandas,pyarrow]", 'os.path.join("..", "bigquery")'] templated_files = common.py_library( unit_cov_level=79, cov_level=79, From 2bbc8e35476d19162c98719b636983ea5fab55fd Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 21 Aug 2019 16:07:43 -0700 Subject: [PATCH 2/4] Only install bigquery library in system tests. --- bigquery_storage/synth.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bigquery_storage/synth.py b/bigquery_storage/synth.py index da38790581d6..9688623beb22 100644 --- a/bigquery_storage/synth.py +++ b/bigquery_storage/synth.py @@ -122,13 +122,14 @@ # ---------------------------------------------------------------------------- # Add templated files # ---------------------------------------------------------------------------- -extra_deps = [".[fastavro,pandas,pyarrow]", 'os.path.join("..", "bigquery")'] +optional_deps = [".[fastavro,pandas,pyarrow]"] +system_test_deps = optional_deps + ['os.path.join("..", "bigquery")'] templated_files = common.py_library( unit_cov_level=79, cov_level=79, samples_test=True, - system_test_dependencies=extra_deps, - unit_test_dependencies=extra_deps, + system_test_dependencies=system_test_deps, + unit_test_dependencies=optional_deps, ) s.move(templated_files) From 2c639d3b72faa465e0f2736d3887039871d70f3b Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 21 Aug 2019 16:16:05 -0700 Subject: [PATCH 3/4] Render with synthtool --- bigquery_storage/noxfile.py | 2 +- bigquery_storage/synth.metadata | 10 +++++----- bigquery_storage/synth.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bigquery_storage/noxfile.py b/bigquery_storage/noxfile.py index 79b9d3689512..677d63845845 100644 --- a/bigquery_storage/noxfile.py +++ b/bigquery_storage/noxfile.py @@ -118,7 +118,7 @@ def system(session): session.install("-e", local_dep) session.install("-e", "../test_utils/") session.install("-e", ".[fastavro,pandas,pyarrow]") - session.install("-e", "../bigquery/") + session.install("-e", "../bigquery") session.install("-e", ".") # Run py.test against the system tests. diff --git a/bigquery_storage/synth.metadata b/bigquery_storage/synth.metadata index 8169754f2a51..d992821808ef 100644 --- a/bigquery_storage/synth.metadata +++ b/bigquery_storage/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-08-05T23:37:16.480074Z", + "updateTime": "2019-08-21T23:15:51.548970Z", "sources": [ { "generator": { "name": "artman", - "version": "0.32.1", - "dockerImage": "googleapis/artman@sha256:a684d40ba9a4e15946f5f2ca6b4bd9fe301192f522e9de4fff622118775f309b" + "version": "0.34.0", + "dockerImage": "googleapis/artman@sha256:38a27ba6245f96c3e86df7acb2ebcc33b4f186d9e475efe2d64303aec3d4e0ea" } }, { "git": { "name": "googleapis", "remote": "git@github.com:googleapis/googleapis.git", - "sha": "e699b0cba64ffddfae39633417180f1f65875896", - "internalRef": "261759677" + "sha": "92bebf78345af8b2d3585220527115bda8bdedf8", + "internalRef": "264715111" } }, { diff --git a/bigquery_storage/synth.py b/bigquery_storage/synth.py index 9688623beb22..5a504158507a 100644 --- a/bigquery_storage/synth.py +++ b/bigquery_storage/synth.py @@ -123,7 +123,7 @@ # Add templated files # ---------------------------------------------------------------------------- optional_deps = [".[fastavro,pandas,pyarrow]"] -system_test_deps = optional_deps + ['os.path.join("..", "bigquery")'] +system_test_deps = optional_deps + ["../bigquery"] templated_files = common.py_library( unit_cov_level=79, cov_level=79, From f9823cca9dd4a8115d8e6737bf69d8c7368ac5b2 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 21 Aug 2019 16:21:25 -0700 Subject: [PATCH 4/4] Render with synthtool --- bigquery_storage/noxfile.py | 2 +- bigquery_storage/synth.metadata | 2 +- bigquery_storage/synth.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bigquery_storage/noxfile.py b/bigquery_storage/noxfile.py index 677d63845845..79b9d3689512 100644 --- a/bigquery_storage/noxfile.py +++ b/bigquery_storage/noxfile.py @@ -118,7 +118,7 @@ def system(session): session.install("-e", local_dep) session.install("-e", "../test_utils/") session.install("-e", ".[fastavro,pandas,pyarrow]") - session.install("-e", "../bigquery") + session.install("-e", "../bigquery/") session.install("-e", ".") # Run py.test against the system tests. diff --git a/bigquery_storage/synth.metadata b/bigquery_storage/synth.metadata index d992821808ef..5695e76c7e81 100644 --- a/bigquery_storage/synth.metadata +++ b/bigquery_storage/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-08-21T23:15:51.548970Z", + "updateTime": "2019-08-21T23:20:45.275738Z", "sources": [ { "generator": { diff --git a/bigquery_storage/synth.py b/bigquery_storage/synth.py index 5a504158507a..cbbeffd02acf 100644 --- a/bigquery_storage/synth.py +++ b/bigquery_storage/synth.py @@ -123,7 +123,7 @@ # Add templated files # ---------------------------------------------------------------------------- optional_deps = [".[fastavro,pandas,pyarrow]"] -system_test_deps = optional_deps + ["../bigquery"] +system_test_deps = optional_deps + ["../bigquery/"] templated_files = common.py_library( unit_cov_level=79, cov_level=79,