chore: ensure mypy passes

google/cloud/__init__.py

@@ -1,8 +1,10 @@
+from typing import List
+
 try:
-    import pkg_resources  # type: ignore
+    import pkg_resources
 
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     import pkgutil
 
-    __path__ = pkgutil.extend_path(__path__, __name__)
+    __path__: List[str] = pkgutil.extend_path(__path__, __name__)

google/cloud/bigtable/__init__.py

@@ -16,9 +16,9 @@
 
 
 from typing import Optional
-import pkg_resources  # type: ignore
+import pkg_resources
 
-__version__ : Optional[str]
+__version__: Optional[str]
 try:
     __version__ = pkg_resources.get_distribution("google-cloud-bigtable").version
 except pkg_resources.DistributionNotFound:

google/cloud/bigtable/client.py

@@ -45,7 +45,7 @@
     BigtableTableAdminGrpcTransport,
 )
 
-from google.cloud.bigtable import __version__ 
+from google.cloud.bigtable import __version__
 from google.cloud.bigtable.instance import Instance
 from google.cloud.bigtable.cluster import Cluster
 

google/cloud/bigtable/table.py

@@ -1043,10 +1043,6 @@ class _RetryableMutateRowsWorker(object):
     are retryable, any subsequent call on this callable will be a no-op.
     """
 
-    RETRY_CODES = tuple(
-        retryable.grpc_status_code.value[0] for retryable in RETRYABLE_MUTATION_ERRORS
-    )
-
     def __init__(self, client, table_name, rows, app_profile_id=None, timeout=None):
         self.client = client
         self.table_name = table_name
@@ -1083,7 +1079,12 @@ def __call__(self, retry=DEFAULT_RETRY):
 
     @staticmethod
     def _is_retryable(status):
-        return status is None or status.code in _RetryableMutateRowsWorker.RETRY_CODES
+        RETRY_CODES = tuple(
+            retryable.grpc_status_code.value[0]
+            for retryable in RETRYABLE_MUTATION_ERRORS
+        )
+
+        return status is None or status.code in RETRY_CODES
 
     def _do_mutate_retryable_rows(self):
         """Mutate all the rows that are eligible for retry.
@@ -1128,7 +1129,7 @@ def _do_mutate_retryable_rows(self):
                 **kwargs
             )
         except RETRYABLE_MUTATION_ERRORS:
-            # If an exception, considered retryable by `RETRY_CODES`, is
+            # If an exception, considered retryable by `RETRYABLE_MUTATION_ERRORS`, is
             # returned from the initial call, consider
             # it to be retryable. Wrap as a Bigtable Retryable Error.
             raise _BigtableRetryableError

noxfile.py

@@ -77,10 +77,9 @@ 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.install("mypy", "types-setuptools")
+    # TODO: also verify types on tests
     session.run("mypy", "-p", "google.cloud.bigtable", "--no-incremental")
 
 

owlbot.py

@@ -165,18 +165,10 @@ 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"
-    )
+    session.install("mypy", "types-setuptools")
+    # TODO: also verify types on tests
+    session.run("mypy", "-p", "google", "--no-incremental")
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)