From 3305edb6ed71867078260f45708526bc876e2d04 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 15 Nov 2021 10:43:27 -0500
Subject: [PATCH] chore: strip unnecessary 'type: ignore' comments

---
 google/cloud/datastore/_http.py                           | 2 +-
 google/cloud/datastore/client.py                          | 6 +++---
 .../services/datastore_admin/async_client.py              | 6 +++---
 .../datastore_admin_v1/services/datastore_admin/client.py | 6 +++---
 .../services/datastore_admin/transports/base.py           | 2 +-
 .../services/datastore_admin/transports/grpc.py           | 4 ++--
 .../services/datastore_admin/transports/grpc_asyncio.py   | 6 +++---
 google/cloud/datastore_admin_v1/types/datastore_admin.py  | 4 ++--
 google/cloud/datastore_admin_v1/types/index.py            | 2 +-
 .../datastore_v1/services/datastore/transports/grpc.py    | 2 +-
 .../services/datastore/transports/grpc_asyncio.py         | 4 ++--
 google/cloud/datastore_v1/types/datastore.py              | 2 +-
 google/cloud/datastore_v1/types/entity.py                 | 8 ++++----
 google/cloud/datastore_v1/types/query.py                  | 4 ++--
 mypy.ini                                                  | 4 ++--
 noxfile.py                                                | 4 +++-
 owlbot.py                                                 | 4 +++-
 .../unit/gapic/datastore_admin_v1/test_datastore_admin.py | 2 +-
 tests/unit/gapic/datastore_v1/test_datastore.py           | 8 ++++----
 19 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/google/cloud/datastore/_http.py b/google/cloud/datastore/_http.py
index 9ea5aac8..f92c76f0 100644
--- a/google/cloud/datastore/_http.py
+++ b/google/cloud/datastore/_http.py
@@ -17,7 +17,7 @@
 from google.rpc import status_pb2  # type: ignore
 
 from google.cloud import _http as connection_module
-from google.cloud import exceptions  # type: ignore
+from google.cloud import exceptions
 from google.cloud.datastore_v1.types import datastore as _datastore_pb2
 
 
diff --git a/google/cloud/datastore/client.py b/google/cloud/datastore/client.py
index 207759cc..03829ce0 100644
--- a/google/cloud/datastore/client.py
+++ b/google/cloud/datastore/client.py
@@ -18,9 +18,9 @@
 
 import google.api_core.client_options
 from google.auth.credentials import AnonymousCredentials  # type: ignore
-from google.cloud._helpers import _LocalStack  # type: ignore
-from google.cloud._helpers import _determine_default_project as _base_default_project  # type: ignore
-from google.cloud.client import ClientWithProject  # type: ignore
+from google.cloud._helpers import _LocalStack
+from google.cloud._helpers import _determine_default_project as _base_default_project
+from google.cloud.client import ClientWithProject
 from google.cloud.datastore.version import __version__
 from google.cloud.datastore import helpers
 from google.cloud.datastore._http import HTTPDatastoreAPI
diff --git a/google/cloud/datastore_admin_v1/services/datastore_admin/async_client.py b/google/cloud/datastore_admin_v1/services/datastore_admin/async_client.py
index 75d9ce2f..c64a328c 100644
--- a/google/cloud/datastore_admin_v1/services/datastore_admin/async_client.py
+++ b/google/cloud/datastore_admin_v1/services/datastore_admin/async_client.py
@@ -31,12 +31,12 @@
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
-from google.api_core import operation  # type: ignore
-from google.api_core import operation_async  # type: ignore
+from google.api_core import operation
+from google.api_core import operation_async
 from google.cloud.datastore_admin_v1.services.datastore_admin import pagers
 from google.cloud.datastore_admin_v1.types import datastore_admin
 from google.cloud.datastore_admin_v1.types import index
-from google.protobuf import empty_pb2  # type: ignore
+from google.protobuf import empty_pb2
 from .transports.base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc_asyncio import DatastoreAdminGrpcAsyncIOTransport
 from .client import DatastoreAdminClient
diff --git a/google/cloud/datastore_admin_v1/services/datastore_admin/client.py b/google/cloud/datastore_admin_v1/services/datastore_admin/client.py
index 18c8ed7b..695446c5 100644
--- a/google/cloud/datastore_admin_v1/services/datastore_admin/client.py
+++ b/google/cloud/datastore_admin_v1/services/datastore_admin/client.py
@@ -34,12 +34,12 @@
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
-from google.api_core import operation  # type: ignore
-from google.api_core import operation_async  # type: ignore
+from google.api_core import operation
+from google.api_core import operation_async
 from google.cloud.datastore_admin_v1.services.datastore_admin import pagers
 from google.cloud.datastore_admin_v1.types import datastore_admin
 from google.cloud.datastore_admin_v1.types import index
-from google.protobuf import empty_pb2  # type: ignore
+from google.protobuf import empty_pb2
 from .transports.base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc import DatastoreAdminGrpcTransport
 from .transports.grpc_asyncio import DatastoreAdminGrpcAsyncIOTransport
diff --git a/google/cloud/datastore_admin_v1/services/datastore_admin/transports/base.py b/google/cloud/datastore_admin_v1/services/datastore_admin/transports/base.py
index 1b3c3d32..58358b0a 100644
--- a/google/cloud/datastore_admin_v1/services/datastore_admin/transports/base.py
+++ b/google/cloud/datastore_admin_v1/services/datastore_admin/transports/base.py
@@ -28,7 +28,7 @@
 
 from google.cloud.datastore_admin_v1.types import datastore_admin
 from google.cloud.datastore_admin_v1.types import index
-from google.longrunning import operations_pb2  # type: ignore
+from google.longrunning import operations_pb2
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
diff --git a/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc.py b/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc.py
index 3d08e9db..d7018fcb 100644
--- a/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc.py
+++ b/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc.py
@@ -23,11 +23,11 @@
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 
-import grpc  # type: ignore
+import grpc
 
 from google.cloud.datastore_admin_v1.types import datastore_admin
 from google.cloud.datastore_admin_v1.types import index
-from google.longrunning import operations_pb2  # type: ignore
+from google.longrunning import operations_pb2
 from .base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO
 
 
diff --git a/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc_asyncio.py b/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc_asyncio.py
index 3f9e5330..84b5299b 100644
--- a/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc_asyncio.py
+++ b/google/cloud/datastore_admin_v1/services/datastore_admin/transports/grpc_asyncio.py
@@ -22,12 +22,12 @@
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 
-import grpc  # type: ignore
-from grpc.experimental import aio  # type: ignore
+import grpc
+from grpc.experimental import aio
 
 from google.cloud.datastore_admin_v1.types import datastore_admin
 from google.cloud.datastore_admin_v1.types import index
-from google.longrunning import operations_pb2  # type: ignore
+from google.longrunning import operations_pb2
 from .base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO
 from .grpc import DatastoreAdminGrpcTransport
 
diff --git a/google/cloud/datastore_admin_v1/types/datastore_admin.py b/google/cloud/datastore_admin_v1/types/datastore_admin.py
index 77af4891..0d42d802 100644
--- a/google/cloud/datastore_admin_v1/types/datastore_admin.py
+++ b/google/cloud/datastore_admin_v1/types/datastore_admin.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
+import proto
 
 from google.cloud.datastore_admin_v1.types import index as gda_index
-from google.protobuf import timestamp_pb2  # type: ignore
+from google.protobuf import timestamp_pb2
 
 
 __protobuf__ = proto.module(
diff --git a/google/cloud/datastore_admin_v1/types/index.py b/google/cloud/datastore_admin_v1/types/index.py
index b372cccf..7a57c945 100644
--- a/google/cloud/datastore_admin_v1/types/index.py
+++ b/google/cloud/datastore_admin_v1/types/index.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
+import proto
 
 
 __protobuf__ = proto.module(package="google.datastore.admin.v1", manifest={"Index",},)
diff --git a/google/cloud/datastore_v1/services/datastore/transports/grpc.py b/google/cloud/datastore_v1/services/datastore/transports/grpc.py
index 55c93eb8..79071c80 100644
--- a/google/cloud/datastore_v1/services/datastore/transports/grpc.py
+++ b/google/cloud/datastore_v1/services/datastore/transports/grpc.py
@@ -22,7 +22,7 @@
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 
-import grpc  # type: ignore
+import grpc
 
 from google.cloud.datastore_v1.types import datastore
 from .base import DatastoreTransport, DEFAULT_CLIENT_INFO
diff --git a/google/cloud/datastore_v1/services/datastore/transports/grpc_asyncio.py b/google/cloud/datastore_v1/services/datastore/transports/grpc_asyncio.py
index 2e71d297..7543acee 100644
--- a/google/cloud/datastore_v1/services/datastore/transports/grpc_asyncio.py
+++ b/google/cloud/datastore_v1/services/datastore/transports/grpc_asyncio.py
@@ -21,8 +21,8 @@
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 
-import grpc  # type: ignore
-from grpc.experimental import aio  # type: ignore
+import grpc
+from grpc.experimental import aio
 
 from google.cloud.datastore_v1.types import datastore
 from .base import DatastoreTransport, DEFAULT_CLIENT_INFO
diff --git a/google/cloud/datastore_v1/types/datastore.py b/google/cloud/datastore_v1/types/datastore.py
index f3f87f6c..efd696aa 100644
--- a/google/cloud/datastore_v1/types/datastore.py
+++ b/google/cloud/datastore_v1/types/datastore.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
+import proto
 
 from google.cloud.datastore_v1.types import entity
 from google.cloud.datastore_v1.types import query as gd_query
diff --git a/google/cloud/datastore_v1/types/entity.py b/google/cloud/datastore_v1/types/entity.py
index 828d43e5..8bf66889 100644
--- a/google/cloud/datastore_v1/types/entity.py
+++ b/google/cloud/datastore_v1/types/entity.py
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
+import proto
 
-from google.protobuf import struct_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
-from google.type import latlng_pb2  # type: ignore
+from google.protobuf import struct_pb2
+from google.protobuf import timestamp_pb2
+from google.type import latlng_pb2
 
 
 __protobuf__ = proto.module(
diff --git a/google/cloud/datastore_v1/types/query.py b/google/cloud/datastore_v1/types/query.py
index b42e7191..6ae31257 100644
--- a/google/cloud/datastore_v1/types/query.py
+++ b/google/cloud/datastore_v1/types/query.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
+import proto
 
 from google.cloud.datastore_v1.types import entity as gd_entity
-from google.protobuf import wrappers_pb2  # type: ignore
+from google.protobuf import wrappers_pb2
 
 
 __protobuf__ = proto.module(
diff --git a/mypy.ini b/mypy.ini
index 5663b40d..17f8a8f6 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -3,5 +3,5 @@ python_version = 3.6
 namespace_packages = True
 ignore_missing_imports = True
 
-[mypy-google.protobuf]
-ignore_missing_imports = True
+[mypy-google.cloud.datastore._app_engine_key_pb2]
+ignore_errors = True
diff --git a/noxfile.py b/noxfile.py
index 44bb4fc7..c8cc8070 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -77,7 +77,9 @@ def blacken(session):
 def mypy(session):
     """Verify type hints are mypy compatible."""
     session.install("-e", ".")
-    session.install("mypy", "types-setuptools", "types-mock", "types-requests")
+    session.install(
+        "mypy", "types-setuptools", "types-mock", "types-protobuf", "types-requests"
+    )
     session.run("mypy", "google/", "tests/")
 
 
diff --git a/owlbot.py b/owlbot.py
index b3116698..fbf8c131 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -276,7 +276,9 @@ def lint_setup_py\(session\):
 def mypy(session):
     """Verify type hints are mypy compatible."""
     session.install("-e", ".")
-    session.install("mypy", "types-setuptools", "types-mock", "types-requests")
+    session.install(
+        "mypy", "types-setuptools", "types-mock", "types-protobuf", "types-requests"
+    )
     session.run("mypy", "google/", "tests/")
 
 
diff --git a/tests/unit/gapic/datastore_admin_v1/test_datastore_admin.py b/tests/unit/gapic/datastore_admin_v1/test_datastore_admin.py
index 69c55257..293b1111 100644
--- a/tests/unit/gapic/datastore_admin_v1/test_datastore_admin.py
+++ b/tests/unit/gapic/datastore_admin_v1/test_datastore_admin.py
@@ -29,7 +29,7 @@
 from google.api_core import gapic_v1
 from google.api_core import grpc_helpers
 from google.api_core import grpc_helpers_async
-from google.api_core import operation_async  # type: ignore
+from google.api_core import operation_async
 from google.api_core import operations_v1
 from google.api_core import path_template
 from google.auth import credentials as ga_credentials
diff --git a/tests/unit/gapic/datastore_v1/test_datastore.py b/tests/unit/gapic/datastore_v1/test_datastore.py
index b58b5ad5..acfffd84 100644
--- a/tests/unit/gapic/datastore_v1/test_datastore.py
+++ b/tests/unit/gapic/datastore_v1/test_datastore.py
@@ -38,10 +38,10 @@
 from google.cloud.datastore_v1.types import entity
 from google.cloud.datastore_v1.types import query
 from google.oauth2 import service_account
-from google.protobuf import struct_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
-from google.protobuf import wrappers_pb2  # type: ignore
-from google.type import latlng_pb2  # type: ignore
+from google.protobuf import struct_pb2
+from google.protobuf import timestamp_pb2
+from google.protobuf import wrappers_pb2
+from google.type import latlng_pb2
 import google.auth