Repository: beam Updated Branches: refs/heads/release-2.1.0 adcd58f38 -> f8234b969
[BEAM-2570] Fix breakage after cloud-bigquery updated Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/a54c2c0d Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/a54c2c0d Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/a54c2c0d Branch: refs/heads/release-2.1.0 Commit: a54c2c0dfc518f9daa13d81dc9e80558df7f9dcc Parents: adcd58f Author: Mark Liu <mark...@google.com> Authored: Fri Jul 7 15:20:12 2017 -0700 Committer: Ahmet Altay <al...@google.com> Committed: Fri Jul 7 23:41:06 2017 -0700 ---------------------------------------------------------------------- sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py | 6 +++--- sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py | 2 +- sdks/python/setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/a54c2c0d/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py index 844cbc5..d6f0e97 100644 --- a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py +++ b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py @@ -92,9 +92,9 @@ class BigqueryMatcher(BaseMatcher): page_token = None results = [] while True: - rows, _, page_token = query.fetch_data(page_token=page_token) - results.extend(rows) - if not page_token: + for row in query.fetch_data(page_token=page_token): + results.append(row) + if results: break return results http://git-wip-us.apache.org/repos/asf/beam/blob/a54c2c0d/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py index f12293e..5b72285 100644 --- a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py +++ b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py @@ -53,7 +53,7 @@ class BigqueryMatcherTest(unittest.TestCase): matcher = bq_verifier.BigqueryMatcher( 'mock_project', 'mock_query', - 'da39a3ee5e6b4b0d3255bfef95601890afd80709') + '59f9d6bdee30d67ea73b8aded121c3a0280f9cd8') hc_assert_that(self._mock_result, matcher) @patch.object(bigquery, 'Client') http://git-wip-us.apache.org/repos/asf/beam/blob/a54c2c0d/sdks/python/setup.py ---------------------------------------------------------------------- diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 8a0c9ae..da82466 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -122,7 +122,7 @@ GCP_REQUIREMENTS = [ 'googledatastore==7.0.1', 'google-cloud-pubsub==0.26.0', # GCP packages required by tests - 'google-cloud-bigquery>=0.23.0,<0.26.0', + 'google-cloud-bigquery==0.25.0', ]
