Skip to content

Commit 6ae2b6e

Browse files
committed
WIP: Add logging statements to identify location failure
1 parent 69c077b commit 6ae2b6e

File tree

8 files changed

+211
-16
lines changed

8 files changed

+211
-16
lines changed

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

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ from {{package_path}} import gapic_version as package_version
77

88
__version__ = package_version.__version__
99

10-
10+
import logging
1111
import google.api_core as api_core
1212
try:
1313
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
@@ -24,18 +24,26 @@ try:
2424
# An older version of api_core is installed, which does not define the
2525
# functions above. We do equivalent checks manually.
2626

27+
print("***before imports") # was logging
28+
2729
import warnings
2830
import sys
2931

3032
_py_version_str = sys.version.split()[0]
3133
_package_label = "{{package_path}}"
34+
35+
print("***before old version check") # was logging
36+
3237
if sys.version_info < (3, 9):
3338
warnings.warn("You are using a non-supported Python version " +
3439
f"({_py_version_str}). Google will not post any further " +
3540
f"updates to {_package_label} supporting this Python version. " +
3641
"Please upgrade to the latest Python version, or at " +
3742
f"least to Python 3.9, and then update {_package_label}.",
3843
FutureWarning)
44+
45+
print("***before Py 3.9 check") # was logging
46+
3947
if sys.version_info[:2] == (3, 9):
4048
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
4149
f"which Google will stop supporting in {_package_label} when " +
@@ -45,20 +53,36 @@ try:
4553
f"then update {_package_label}.",
4654
FutureWarning)
4755

56+
print("***before packaging import") # was logging
57+
58+
4859
from packaging.version import parse as parse_version
4960

61+
print("***before sys.version check for packaging") # was logging
62+
5063
if sys.version_info < (3, 8):
64+
65+
print("***defining package version for older version: before import") # was logging
66+
5167
import pkg_resources
5268

69+
print("***after importing pkg_resources") # was logging
70+
5371
def _get_version(dependency_name):
5472
try:
5573
version_string = pkg_resources.get_distribution(dependency_name).version
5674
return (parse_version(version_string), version_string)
5775
except pkg_resources.DistributionNotFound:
5876
return (None, "--")
5977
else:
78+
79+
print("***defining package version for newer version: before import") # was logging
80+
6081
from importlib import metadata
6182

83+
print("***after importing metadata") # was logging
84+
85+
6286
def _get_version(dependency_name):
6387
try:
6488
version_string = metadata.version("requests")
@@ -67,9 +91,12 @@ try:
6791
except metadata.PackageNotFoundError:
6892
return (None, "--")
6993

94+
95+
print("***before echoing package versions") # was logging
96+
7097
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
7198
(_version_used, _version_used_string) = _get_version(_dependency_package)
72-
print(f"*** Dependency: {dependency_package} @ {_version_used_string}")
99+
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
73100

74101
_dependency_package = "google.protobuf"
75102
_next_supported_version = "4.25.8"

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
__version__ = package_version.__version__
1919

20-
20+
import logging
2121
import google.api_core as api_core
2222
try:
2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
@@ -27,18 +27,26 @@
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.
2929

30+
print("***before imports") # was logging
31+
3032
import warnings
3133
import sys
3234

3335
_py_version_str = sys.version.split()[0]
3436
_package_label = "google.cloud.asset_v1"
37+
38+
print("***before old version check") # was logging
39+
3540
if sys.version_info < (3, 9):
3641
warnings.warn("You are using a non-supported Python version " +
3742
f"({_py_version_str}). Google will not post any further " +
3843
f"updates to {_package_label} supporting this Python version. " +
3944
"Please upgrade to the latest Python version, or at " +
4045
f"least to Python 3.9, and then update {_package_label}.",
4146
FutureWarning)
47+
48+
print("***before Py 3.9 check") # was logging
49+
4250
if sys.version_info[:2] == (3, 9):
4351
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
4452
f"which Google will stop supporting in {_package_label} when " +
@@ -48,20 +56,34 @@
4856
f"then update {_package_label}.",
4957
FutureWarning)
5058

59+
print("***before packaging import") # was logging
60+
5161
from packaging.version import parse as parse_version
5262

63+
print("***before sys.version check for packaging") # was logging
64+
5365
if sys.version_info < (3, 8):
66+
67+
print("***defining package version for older version: before import") # was logging
68+
5469
import pkg_resources
5570

71+
print("***after importing pkg_resources") # was logging
72+
5673
def _get_version(dependency_name):
5774
try:
5875
version_string = pkg_resources.get_distribution(dependency_name).version
5976
return (parse_version(version_string), version_string)
6077
except pkg_resources.DistributionNotFound:
6178
return (None, "--")
6279
else:
80+
81+
print("***defining package version for newer version: before import") # was logging
82+
6383
from importlib import metadata
6484

85+
print("***after importing metadata") # was logging
86+
6587
def _get_version(dependency_name):
6688
try:
6789
version_string = metadata.version("requests")
@@ -70,9 +92,11 @@ def _get_version(dependency_name):
7092
except metadata.PackageNotFoundError:
7193
return (None, "--")
7294

95+
print("***before echoing package versions") # was logging
96+
7397
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
7498
(_version_used, _version_used_string) = _get_version(_dependency_package)
75-
print(f"*** Dependency: {dependency_package} @ {_version_used_string}")
99+
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
76100

77101
_dependency_package = "google.protobuf"
78102
_next_supported_version = "4.25.8"

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
__version__ = package_version.__version__
1919

20-
20+
import logging
2121
import google.api_core as api_core
2222
try:
2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
@@ -27,18 +27,26 @@
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.
2929

30+
print("***before imports") # was logging
31+
3032
import warnings
3133
import sys
3234

3335
_py_version_str = sys.version.split()[0]
3436
_package_label = "google.iam.credentials_v1"
37+
38+
print("***before old version check") # was logging
39+
3540
if sys.version_info < (3, 9):
3641
warnings.warn("You are using a non-supported Python version " +
3742
f"({_py_version_str}). Google will not post any further " +
3843
f"updates to {_package_label} supporting this Python version. " +
3944
"Please upgrade to the latest Python version, or at " +
4045
f"least to Python 3.9, and then update {_package_label}.",
4146
FutureWarning)
47+
48+
print("***before Py 3.9 check") # was logging
49+
4250
if sys.version_info[:2] == (3, 9):
4351
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
4452
f"which Google will stop supporting in {_package_label} when " +
@@ -48,20 +56,34 @@
4856
f"then update {_package_label}.",
4957
FutureWarning)
5058

59+
print("***before packaging import") # was logging
60+
5161
from packaging.version import parse as parse_version
5262

63+
print("***before sys.version check for packaging") # was logging
64+
5365
if sys.version_info < (3, 8):
66+
67+
print("***defining package version for older version: before import") # was logging
68+
5469
import pkg_resources
5570

71+
print("***after importing pkg_resources") # was logging
72+
5673
def _get_version(dependency_name):
5774
try:
5875
version_string = pkg_resources.get_distribution(dependency_name).version
5976
return (parse_version(version_string), version_string)
6077
except pkg_resources.DistributionNotFound:
6178
return (None, "--")
6279
else:
80+
81+
print("***defining package version for newer version: before import") # was logging
82+
6383
from importlib import metadata
6484

85+
print("***after importing metadata") # was logging
86+
6587
def _get_version(dependency_name):
6688
try:
6789
version_string = metadata.version("requests")
@@ -70,9 +92,11 @@ def _get_version(dependency_name):
7092
except metadata.PackageNotFoundError:
7193
return (None, "--")
7294

95+
print("***before echoing package versions") # was logging
96+
7397
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
7498
(_version_used, _version_used_string) = _get_version(_dependency_package)
75-
print(f"*** Dependency: {dependency_package} @ {_version_used_string}")
99+
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
76100

77101
_dependency_package = "google.protobuf"
78102
_next_supported_version = "4.25.8"

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
__version__ = package_version.__version__
1919

20-
20+
import logging
2121
import google.api_core as api_core
2222
try:
2323
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
@@ -27,18 +27,26 @@
2727
# An older version of api_core is installed, which does not define the
2828
# functions above. We do equivalent checks manually.
2929

30+
print("***before imports") # was logging
31+
3032
import warnings
3133
import sys
3234

3335
_py_version_str = sys.version.split()[0]
3436
_package_label = "google.cloud.eventarc_v1"
37+
38+
print("***before old version check") # was logging
39+
3540
if sys.version_info < (3, 9):
3641
warnings.warn("You are using a non-supported Python version " +
3742
f"({_py_version_str}). Google will not post any further " +
3843
f"updates to {_package_label} supporting this Python version. " +
3944
"Please upgrade to the latest Python version, or at " +
4045
f"least to Python 3.9, and then update {_package_label}.",
4146
FutureWarning)
47+
48+
print("***before Py 3.9 check") # was logging
49+
4250
if sys.version_info[:2] == (3, 9):
4351
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
4452
f"which Google will stop supporting in {_package_label} when " +
@@ -48,20 +56,34 @@
4856
f"then update {_package_label}.",
4957
FutureWarning)
5058

59+
print("***before packaging import") # was logging
60+
5161
from packaging.version import parse as parse_version
5262

63+
print("***before sys.version check for packaging") # was logging
64+
5365
if sys.version_info < (3, 8):
66+
67+
print("***defining package version for older version: before import") # was logging
68+
5469
import pkg_resources
5570

71+
print("***after importing pkg_resources") # was logging
72+
5673
def _get_version(dependency_name):
5774
try:
5875
version_string = pkg_resources.get_distribution(dependency_name).version
5976
return (parse_version(version_string), version_string)
6077
except pkg_resources.DistributionNotFound:
6178
return (None, "--")
6279
else:
80+
81+
print("***defining package version for newer version: before import") # was logging
82+
6383
from importlib import metadata
6484

85+
print("***after importing metadata") # was logging
86+
6587
def _get_version(dependency_name):
6688
try:
6789
version_string = metadata.version("requests")
@@ -70,9 +92,11 @@ def _get_version(dependency_name):
7092
except metadata.PackageNotFoundError:
7193
return (None, "--")
7294

95+
print("***before echoing package versions") # was logging
96+
7397
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
7498
(_version_used, _version_used_string) = _get_version(_dependency_package)
75-
print(f"*** Dependency: {dependency_package} @ {_version_used_string}")
99+
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
76100

77101
_dependency_package = "google.protobuf"
78102
_next_supported_version = "4.25.8"

0 commit comments

Comments
 (0)