Skip to content

Commit 3cb43b4

Browse files
committed
fix: skip type warnings for imports not present in older api_core
1 parent 40f4214 commit 3cb43b4

File tree

8 files changed

+18
-17
lines changed

8 files changed

+18
-17
lines changed

gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ __version__ = package_version.__version__
1111
import google.api_core as api_core
1212

1313
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
14-
api_core.check_python_version("{{package_path}}")
15-
api_core.check_dependency_versions("{{package_path}}")
14+
{# TODO(api_core): remove `type:ignore` below when minimum version of api_core makes the else clause unnecessary. #}
15+
api_core.check_python_version("{{package_path}}") # type: ignore
16+
api_core.check_dependency_versions("{{package_path}}") # type: ignore
1617
else:
17-
{# TODO: Remove this try-catch when we require api-core at a version that
18+
{# TODO(api_core): Remove this try-catch when we require api-core at a version that
1819
supports the changes in https://github.com/googleapis/python-api-core/pull/832
1920
2021
In the meantime, please ensure the functionality here mirrors the

tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.cloud.asset_v1")
25-
api_core.check_dependency_versions("google.cloud.asset_v1")
24+
api_core.check_python_version("google.cloud.asset_v1") # type: ignore
25+
api_core.check_dependency_versions("google.cloud.asset_v1") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

tests/integration/goldens/credentials/google/iam/credentials_v1/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.iam.credentials_v1")
25-
api_core.check_dependency_versions("google.iam.credentials_v1")
24+
api_core.check_python_version("google.iam.credentials_v1") # type: ignore
25+
api_core.check_dependency_versions("google.iam.credentials_v1") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

tests/integration/goldens/eventarc/google/cloud/eventarc_v1/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.cloud.eventarc_v1")
25-
api_core.check_dependency_versions("google.cloud.eventarc_v1")
24+
api_core.check_python_version("google.cloud.eventarc_v1") # type: ignore
25+
api_core.check_dependency_versions("google.cloud.eventarc_v1") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

tests/integration/goldens/logging/google/cloud/logging_v2/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.cloud.logging_v2")
25-
api_core.check_dependency_versions("google.cloud.logging_v2")
24+
api_core.check_python_version("google.cloud.logging_v2") # type: ignore
25+
api_core.check_dependency_versions("google.cloud.logging_v2") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

tests/integration/goldens/logging_internal/google/cloud/logging_v2/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.cloud.logging_v2")
25-
api_core.check_dependency_versions("google.cloud.logging_v2")
24+
api_core.check_python_version("google.cloud.logging_v2") # type: ignore
25+
api_core.check_dependency_versions("google.cloud.logging_v2") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.cloud.redis_v1")
25-
api_core.check_dependency_versions("google.cloud.redis_v1")
24+
api_core.check_python_version("google.cloud.redis_v1") # type: ignore
25+
api_core.check_dependency_versions("google.cloud.redis_v1") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

tests/integration/goldens/redis_selective/google/cloud/redis_v1/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import google.api_core as api_core
2222

2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"):
24-
api_core.check_python_version("google.cloud.redis_v1")
25-
api_core.check_dependency_versions("google.cloud.redis_v1")
24+
api_core.check_python_version("google.cloud.redis_v1") # type: ignore
25+
api_core.check_dependency_versions("google.cloud.redis_v1") # type: ignore
2626
else:
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.

0 commit comments

Comments
 (0)