chore: Prepare for 2.0 release

.kokoro/presubmit/presubmit.cfg

@@ -1,7 +1 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Disable system tests.
-env_vars: {
-    key: "RUN_SYSTEM_TESTS"
-    value: "false"
-}
+# Format: //devtools/kokoro/config/proto/build.proto

CONTRIBUTING.rst

@@ -80,25 +80,6 @@ We use `nox <https://nox.readthedocs.io/en/latest/>`__ to instrument our tests.
 
 .. nox: https://pypi.org/project/nox/
 
-Note on Editable Installs / Develop Mode
-========================================
-
-- As mentioned previously, using ``setuptools`` in `develop mode`_
-  or a ``pip`` `editable install`_ is not possible with this
-  library. This is because this library uses `namespace packages`_.
-  For context see `Issue #2316`_ and the relevant `PyPA issue`_.
-
-  Since ``editable`` / ``develop`` mode can't be used, packages
-  need to be installed directly. Hence your changes to the source
-  tree don't get incorporated into the **already installed**
-  package.
-
-.. _namespace packages: https://www.python.org/dev/peps/pep-0420/
-.. _Issue #2316: https://github.com/GoogleCloudPlatform/google-cloud-python/issues/2316
-.. _PyPA issue: https://github.com/pypa/packaging-problems/issues/12
-.. _develop mode: https://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode
-.. _editable install: https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
-
 *****************************************
 I'm getting weird errors... Can you help?
 *****************************************

README.rst

@@ -52,11 +52,14 @@ dependencies.
 
 Supported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^
-Python >= 3.5
+Python >= 3.6
 
-Deprecated Python Versions
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Python == 2.7. Python 2.7 support will be removed on January 1, 2020.
+Unsupported Python Versions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Python == 2.7, Python == 3.5.
+
+The last version of this library compatible with Python 2.7 and 3.5 is
+`google-cloud-bigquery==1.28.0`.
 
 
 Mac/Linux

UPGRADING.md

@@ -0,0 +1,37 @@
+<!--
+Copyright 2020 Google LLC
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    https://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+
+# 2.0.0 Migration Guide
+
+The 2.0 release of the `google-cloud-bigquery` client drops support for Python
+versions below 3.6. The client surface itself has not changed, but the 1.x series
+will not be receiving any more feature updates or bug fixes. You are thus
+encouraged to upgrade to the 2.x series.
+
+If you experience issues or have questions, please file an
+[issue](https://github.com/googleapis/python-bigquery/issues).
+
+
+## Supported Python Versions
+
+> **WARNING**: Breaking change
+
+The 2.0.0 release requires Python 3.6+.
+
+
+## Supported BigQuery Storage Clients
+
+The 2.0.0 release requires BigQuery Storage `>= 2.0.0`, which dropped support
+for `v1beta1` and `v1beta2` versions of the BigQuery Storage API. If you want to
+use a BigQuery Storage client, it must be the one supporting the `v1` API version.

docs/UPGRADING.md

@@ -0,0 +1 @@
+../UPGRADING.md

docs/bigquery_v2/services.rst

@@ -0,0 +1,6 @@
+Services for Google Cloud Bigquery v2 API
+=========================================
+
+.. automodule:: google.cloud.bigquery_v2.services.model_service
+    :members:
+    :inherited-members:

docs/bigquery_v2/types.rst

@@ -0,0 +1,5 @@
+Types for Google Cloud Bigquery v2 API
+======================================
+
+.. automodule:: google.cloud.bigquery_v2.types
+    :members:

docs/index.rst

@@ -27,6 +27,16 @@ API Reference
   reference
   dbapi
 
+Migration Guide
+---------------
+
+See the guide below for instructions on migrating to the 2.x release of this library.
+
+.. toctree::
+    :maxdepth: 2
+
+    UPGRADING
+
 Changelog
 ---------
 

google/cloud/bigquery/_pandas_helpers.py

@@ -22,11 +22,6 @@
 import six
 from six.moves import queue
 
-try:
-    from google.cloud import bigquery_storage_v1
-except ImportError:  # pragma: NO COVER
-    bigquery_storage_v1 = None
-
 try:
     import pandas
 except ImportError:  # pragma: NO COVER
@@ -287,14 +282,6 @@ def dataframe_to_bq_schema(dataframe, bq_schema):
     """
     if bq_schema:
         bq_schema = schema._to_schema_fields(bq_schema)
-        if six.PY2:
-            for field in bq_schema:
-                if field.field_type in schema._STRUCT_TYPES:
-                    raise ValueError(
-                        "Uploading dataframes with struct (record) column types "
-                        "is not supported under Python2. See: "
-                        "https://github.com/googleapis/python-bigquery/issues/21"
-                    )
         bq_schema_index = {field.name: field for field in bq_schema}
         bq_schema_unused = set(bq_schema_index.keys())
     else:
@@ -578,19 +565,7 @@ def _bqstorage_page_to_dataframe(column_names, dtypes, page):
 def _download_table_bqstorage_stream(
     download_state, bqstorage_client, session, stream, worker_queue, page_to_item
 ):
-    # Passing a BQ Storage client in implies that the BigQuery Storage library
-    # is available and can be imported.
-    from google.cloud import bigquery_storage_v1beta1
-
-    # We want to preserve comaptibility with the v1beta1 BQ Storage clients,
-    # thus adjust constructing the rowstream if needed.
-    # The assumption is that the caller provides a BQ Storage `session` that is
-    # compatible with the version of the BQ Storage client passed in.
-    if isinstance(bqstorage_client, bigquery_storage_v1beta1.BigQueryStorageClient):
-        position = bigquery_storage_v1beta1.types.StreamPosition(stream=stream)
-        rowstream = bqstorage_client.read_rows(position).rows(session)
-    else:
-        rowstream = bqstorage_client.read_rows(stream.name).rows(session)
+    rowstream = bqstorage_client.read_rows(stream.name).rows(session)
 
     for page in rowstream.pages:
         if download_state.done:
@@ -625,8 +600,7 @@ def _download_table_bqstorage(
 
     # Passing a BQ Storage client in implies that the BigQuery Storage library
     # is available and can be imported.
-    from google.cloud import bigquery_storage_v1
-    from google.cloud import bigquery_storage_v1beta1
+    from google.cloud import bigquery_storage
 
     if "$" in table.table_id:
         raise ValueError(
@@ -637,41 +611,18 @@ def _download_table_bqstorage(
 
     requested_streams = 1 if preserve_order else 0
 
-    # We want to preserve comaptibility with the v1beta1 BQ Storage clients,
-    # thus adjust the session creation if needed.
-    if isinstance(bqstorage_client, bigquery_storage_v1beta1.BigQueryStorageClient):
-        warnings.warn(
-            "Support for BigQuery Storage v1beta1 clients is deprecated, please "
-            "consider upgrading the client to BigQuery Storage v1 stable version.",
-            category=DeprecationWarning,
-        )
-        read_options = bigquery_storage_v1beta1.types.TableReadOptions()
-
-        if selected_fields is not None:
-            for field in selected_fields:
-                read_options.selected_fields.append(field.name)
-
-        session = bqstorage_client.create_read_session(
-            table.to_bqstorage(v1beta1=True),
-            "projects/{}".format(project_id),
-            format_=bigquery_storage_v1beta1.enums.DataFormat.ARROW,
-            read_options=read_options,
-            requested_streams=requested_streams,
-        )
-    else:
-        requested_session = bigquery_storage_v1.types.ReadSession(
-            table=table.to_bqstorage(),
-            data_format=bigquery_storage_v1.enums.DataFormat.ARROW,
-        )
-        if selected_fields is not None:
-            for field in selected_fields:
-                requested_session.read_options.selected_fields.append(field.name)
-
-        session = bqstorage_client.create_read_session(
-            parent="projects/{}".format(project_id),
-            read_session=requested_session,
-            max_stream_count=requested_streams,
-        )
+    requested_session = bigquery_storage.types.ReadSession(
+        table=table.to_bqstorage(), data_format=bigquery_storage.types.DataFormat.ARROW
+    )
+    if selected_fields is not None:
+        for field in selected_fields:
+            requested_session.read_options.selected_fields.append(field.name)
+
+    session = bqstorage_client.create_read_session(
+        parent="projects/{}".format(project_id),
+        read_session=requested_session,
+        max_stream_count=requested_streams,
+    )
 
     _LOGGER.debug(
         "Started reading table '{}.{}.{}' with BQ Storage API session '{}'.".format(

google/cloud/bigquery/client.py

@@ -17,11 +17,7 @@
 from __future__ import absolute_import
 from __future__ import division
 
-try:
-    from collections import abc as collections_abc
-except ImportError:  # Python 2.7
-    import collections as collections_abc
-
+from collections import abc as collections_abc
 import copy
 import functools
 import gzip
@@ -435,19 +431,19 @@ def _create_bqstorage_client(self):
         warning and return ``None``.
 
         Returns:
-            Optional[google.cloud.bigquery_storage_v1.BigQueryReadClient]:
+            Optional[google.cloud.bigquery_storage.BigQueryReadClient]:
                 A BigQuery Storage API client.
         """
         try:
-            from google.cloud import bigquery_storage_v1
+            from google.cloud import bigquery_storage
         except ImportError:
             warnings.warn(
                 "Cannot create BigQuery Storage client, the dependency "
                 "google-cloud-bigquery-storage is not installed."
             )
             return None
 
-        return bigquery_storage_v1.BigQueryReadClient(credentials=self._credentials)
+        return bigquery_storage.BigQueryReadClient(credentials=self._credentials)
 
     def create_dataset(
         self, dataset, exists_ok=False, retry=DEFAULT_RETRY, timeout=None

google/cloud/bigquery/dbapi/_helpers.py

@@ -12,11 +12,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-try:
-    from collections import abc as collections_abc
-except ImportError:  # Python 2.7
-    import collections as collections_abc
 
+from collections import abc as collections_abc
 import datetime
 import decimal
 import functools

google/cloud/bigquery/dbapi/connection.py

@@ -73,7 +73,7 @@ def close(self):
 
         if self._owns_bqstorage_client:
             # There is no close() on the BQ Storage client itself.
-            self._bqstorage_client.transport.channel.close()
+            self._bqstorage_client._transport.grpc_channel.close()
 
         for cursor_ in self._cursors_created:
             cursor_.close()

google/cloud/bigquery/dbapi/cursor.py

@@ -15,14 +15,8 @@
 """Cursor for the Google BigQuery DB-API."""
 
 import collections
+from collections import abc as collections_abc
 import copy
-import warnings
-
-try:
-    from collections import abc as collections_abc
-except ImportError:  # Python 2.7
-    import collections as collections_abc
-
 import logging
 
 import six
@@ -267,54 +261,27 @@ def _bqstorage_fetch(self, bqstorage_client):
                 A sequence of rows, represented as dictionaries.
         """
         # Hitting this code path with a BQ Storage client instance implies that
-        # bigquery_storage_v1* can indeed be imported here without errors.
-        from google.cloud import bigquery_storage_v1
-        from google.cloud import bigquery_storage_v1beta1
+        # bigquery.storage can indeed be imported here without errors.
+        from google.cloud import bigquery_storage
 
         table_reference = self._query_job.destination
 
-        is_v1beta1_client = isinstance(
-            bqstorage_client, bigquery_storage_v1beta1.BigQueryStorageClient
+        requested_session = bigquery_storage.types.ReadSession(
+            table=table_reference.to_bqstorage(),
+            data_format=bigquery_storage.types.DataFormat.ARROW,
+        )
+        read_session = bqstorage_client.create_read_session(
+            parent="projects/{}".format(table_reference.project),
+            read_session=requested_session,
+            # a single stream only, as DB API is not well-suited for multithreading
+            max_stream_count=1,
         )
-
-        # We want to preserve compatibility with the v1beta1 BQ Storage clients,
-        # thus adjust the session creation if needed.
-        if is_v1beta1_client:
-            warnings.warn(
-                "Support for BigQuery Storage v1beta1 clients is deprecated, please "
-                "consider upgrading the client to BigQuery Storage v1 stable version.",
-                category=DeprecationWarning,
-            )
-            read_session = bqstorage_client.create_read_session(
-                table_reference.to_bqstorage(v1beta1=True),
-                "projects/{}".format(table_reference.project),
-                # a single stream only, as DB API is not well-suited for multithreading
-                requested_streams=1,
-                format_=bigquery_storage_v1beta1.enums.DataFormat.ARROW,
-            )
-        else:
-            requested_session = bigquery_storage_v1.types.ReadSession(
-                table=table_reference.to_bqstorage(),
-                data_format=bigquery_storage_v1.enums.DataFormat.ARROW,
-            )
-            read_session = bqstorage_client.create_read_session(
-                parent="projects/{}".format(table_reference.project),
-                read_session=requested_session,
-                # a single stream only, as DB API is not well-suited for multithreading
-                max_stream_count=1,
-            )
 
         if not read_session.streams:
             return iter([])  # empty table, nothing to read
 
-        if is_v1beta1_client:
-            read_position = bigquery_storage_v1beta1.types.StreamPosition(
-                stream=read_session.streams[0],
-            )
-            read_rows_stream = bqstorage_client.read_rows(read_position)
-        else:
-            stream_name = read_session.streams[0].name
-            read_rows_stream = bqstorage_client.read_rows(stream_name)
+        stream_name = read_session.streams[0].name
+        read_rows_stream = bqstorage_client.read_rows(stream_name)
 
         rows_iterable = read_rows_stream.rows(read_session)
         return rows_iterable