chore: ensure mypy passes

google/cloud/__init__.py

@@ -1,5 +1,5 @@
 try:
-    import pkg_resources
+    import pkg_resources  # type: ignore
 
     pkg_resources.declare_namespace(__name__)
 except ImportError:

google/cloud/bigtable/__init__.py

@@ -15,8 +15,10 @@
 """Google Cloud Bigtable API package."""
 
 
-import pkg_resources
+from typing import Optional
+import pkg_resources  # type: ignore
 
+__version__: Optional[str]
 try:
     __version__ = pkg_resources.get_distribution("google-cloud-bigtable").version
 except pkg_resources.DistributionNotFound:

google/cloud/bigtable/app_profile.py

@@ -20,7 +20,7 @@
 from google.cloud.bigtable.enums import RoutingPolicyType
 from google.cloud.bigtable_admin_v2.types import instance
 from google.protobuf import field_mask_pb2
-from google.api_core.exceptions import NotFound
+from google.api_core.exceptions import NotFound  # type: ignore
 
 _APP_PROFILE_NAME_RE = re.compile(
     r"^projects/(?P<project>[^/]+)/"

google/cloud/bigtable/backup.py

@@ -16,12 +16,12 @@
 
 import re
 
-from google.cloud._helpers import _datetime_to_pb_timestamp
+from google.cloud._helpers import _datetime_to_pb_timestamp  # type: ignore
 from google.cloud.bigtable_admin_v2 import BigtableTableAdminClient
 from google.cloud.bigtable_admin_v2.types import table
 from google.cloud.bigtable.encryption_info import EncryptionInfo
 from google.cloud.bigtable.policy import Policy
-from google.cloud.exceptions import NotFound
+from google.cloud.exceptions import NotFound  # type: ignore
 from google.protobuf import field_mask_pb2
 
 _BACKUP_NAME_RE = re.compile(

google/cloud/bigtable/client.py

@@ -29,11 +29,11 @@
 """
 import os
 import warnings
-import grpc
+import grpc  # type: ignore
 
-from google.api_core.gapic_v1 import client_info
-import google.auth
-from google.auth.credentials import AnonymousCredentials
+from google.api_core.gapic_v1 import client_info  # type: ignore
+import google.auth  # type: ignore
+from google.auth.credentials import AnonymousCredentials  # type: ignore
 
 from google.cloud import bigtable_v2
 from google.cloud import bigtable_admin_v2
@@ -49,11 +49,11 @@
 from google.cloud.bigtable.instance import Instance
 from google.cloud.bigtable.cluster import Cluster
 
-from google.cloud.client import ClientWithProject
+from google.cloud.client import ClientWithProject  # type: ignore
 
 from google.cloud.bigtable_admin_v2.types import instance
 from google.cloud.bigtable.cluster import _CLUSTER_NAME_RE
-from google.cloud.environment_vars import BIGTABLE_EMULATOR
+from google.cloud.environment_vars import BIGTABLE_EMULATOR  # type: ignore
 
 
 INSTANCE_TYPE_PRODUCTION = instance.Instance.Type.PRODUCTION

google/cloud/bigtable/cluster.py

@@ -17,7 +17,7 @@
 
 import re
 from google.cloud.bigtable_admin_v2.types import instance
-from google.api_core.exceptions import NotFound
+from google.api_core.exceptions import NotFound  # type: ignore
 
 
 _CLUSTER_NAME_RE = re.compile(

google/cloud/bigtable/instance.py

@@ -24,9 +24,9 @@
 
 from google.cloud.bigtable_admin_v2.types import instance
 
-from google.iam.v1 import options_pb2
+from google.iam.v1 import options_pb2  # type: ignore
 
-from google.api_core.exceptions import NotFound
+from google.api_core.exceptions import NotFound  # type: ignore
 
 from google.cloud.bigtable.policy import Policy
 

google/cloud/bigtable/policy.py

@@ -14,9 +14,9 @@
 
 import base64
 
-from google.api_core.iam import Policy as BasePolicy
-from google.cloud._helpers import _to_bytes
-from google.iam.v1 import policy_pb2
+from google.api_core.iam import Policy as BasePolicy  # type: ignore
+from google.cloud._helpers import _to_bytes  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 
 """IAM roles supported by Bigtable Instance resource"""
 BIGTABLE_ADMIN_ROLE = "roles/bigtable.admin"

google/cloud/bigtable/row.py

@@ -17,9 +17,9 @@
 
 import struct
 
-from google.cloud._helpers import _datetime_from_microseconds
-from google.cloud._helpers import _microseconds_from_datetime
-from google.cloud._helpers import _to_bytes
+from google.cloud._helpers import _datetime_from_microseconds  # type: ignore
+from google.cloud._helpers import _microseconds_from_datetime  # type: ignore
+from google.cloud._helpers import _to_bytes  # type: ignore
 from google.cloud.bigtable_v2.types import data as data_v2_pb2
 
 

google/cloud/bigtable/row_data.py

@@ -17,12 +17,12 @@
 
 import copy
 
-import grpc
+import grpc  # type: ignore
 
-from google.api_core import exceptions
-from google.api_core import retry
-from google.cloud._helpers import _datetime_from_microseconds
-from google.cloud._helpers import _to_bytes
+from google.api_core import exceptions  # type: ignore
+from google.api_core import retry  # type: ignore
+from google.cloud._helpers import _datetime_from_microseconds  # type: ignore
+from google.cloud._helpers import _to_bytes  # type: ignore
 from google.cloud.bigtable_v2.types import bigtable as data_messages_v2_pb2
 from google.cloud.bigtable_v2.types import data as data_v2_pb2
 

google/cloud/bigtable/row_filters.py

@@ -17,8 +17,8 @@
 import struct
 
 
-from google.cloud._helpers import _microseconds_from_datetime
-from google.cloud._helpers import _to_bytes
+from google.cloud._helpers import _microseconds_from_datetime  # type: ignore
+from google.cloud._helpers import _to_bytes  # type: ignore
 from google.cloud.bigtable_v2.types import data as data_v2_pb2
 
 _PACK_I64 = struct.Struct(">q").pack

google/cloud/bigtable/row_set.py

@@ -15,7 +15,7 @@
 """User-friendly container for Google Cloud Bigtable RowSet """
 
 
-from google.cloud._helpers import _to_bytes
+from google.cloud._helpers import _to_bytes  # type: ignore
 
 
 class RowSet(object):

google/cloud/bigtable/table.py

@@ -16,16 +16,16 @@
 
 import warnings
 
-from google.api_core import timeout
-from google.api_core.exceptions import Aborted
+from google.api_core import timeout  # type: ignore
+from google.api_core.exceptions import Aborted  # type: ignore
 from google.api_core.exceptions import DeadlineExceeded
 from google.api_core.exceptions import NotFound
 from google.api_core.exceptions import RetryError
 from google.api_core.exceptions import ServiceUnavailable
-from google.api_core.gapic_v1.method import DEFAULT
-from google.api_core.retry import if_exception_type
+from google.api_core.gapic_v1.method import DEFAULT  # type: ignore
+from google.api_core.retry import if_exception_type  # type: ignore
 from google.api_core.retry import Retry
-from google.cloud._helpers import _to_bytes
+from google.cloud._helpers import _to_bytes  # type: ignore
 from google.cloud.bigtable.backup import Backup
 from google.cloud.bigtable.column_family import _gc_rule_from_pb
 from google.cloud.bigtable.column_family import ColumnFamily

mypy.ini

@@ -0,0 +1,6 @@
+[mypy]
+python_version = 3.6
+namespace_packages = True
+
+[mypy-google.protobuf]
+ignore_missing_imports = True

noxfile.py

@@ -38,6 +38,8 @@
     "unit",
     "system_emulated",
     "system",
+    "mypy",
+    "pytype",
     "cover",
     "lint",
     "lint_setup_py",
@@ -72,6 +74,16 @@ def blacken(session):
     )
 
 
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def mypy(session):
+    """Verify type hints are mypy compatible."""
+
+    session.install("-e", ".")
+    session.install("mypy")
+
+    session.run("mypy", "-p", "google.cloud.bigtable", "--no-incremental")
+
+
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""

owlbot.py

@@ -149,10 +149,41 @@ def system_emulated(session):
     """nox.options.sessions = [
     "unit",
     "system_emulated",
-    "system",""",
+    "system",
+    "mypy",
+    "pytype",""",
 )
 
 
+s.replace(
+    "noxfile.py",
+    """\
+@nox.session\(python=DEFAULT_PYTHON_VERSION\)
+def lint_setup_py\(session\):
+""",
+    '''\
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def mypy(session):
+    """Verify type hints are mypy compatible."""
+
+    session.install("-e", ".")
+    session.install(
+        "mypy"
+    )
+
+    session.run(
+        "mypy",
+        "-p",
+        "google.cloud.bigtable",
+        "--no-incremental"
+    )
+
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def lint_setup_py(session):
+''',
+)
+
 # ----------------------------------------------------------------------------
 # Samples templates
 # ----------------------------------------------------------------------------