Skip to content

Commit cb85cf2

Browse files
vchudnov-gvchudnov-g
committed
WIP: try disabling version check: do test errors persist?
1 parent 477fb3c commit cb85cf2

File tree

8 files changed

+9
-795
lines changed

8 files changed

+9
-795
lines changed

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

Lines changed: 2 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -9,116 +9,9 @@ __version__ = package_version.__version__
99

1010
# import logging
1111
import google.api_core as api_core
12-
try:
13-
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
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
17-
else: # pragma: NO COVER
18-
{# TODO(api_core): Remove this try-catch when we require api-core at a version that
19-
supports the changes in https://github.com/googleapis/python-api-core/pull/832
20-
21-
In the meantime, please ensure the functionality here mirrors the
22-
equivalent functionality in api_core, in those two functions above.
23-
#}
24-
# An older version of api_core is installed, which does not define the
25-
# functions above. We do equivalent checks manually.
26-
27-
print("***before imports") # was logging
28-
29-
import warnings
30-
import sys
31-
32-
_py_version_str = sys.version.split()[0]
33-
_package_label = "{{package_path}}"
34-
35-
print("***before old version check") # was logging
36-
37-
if sys.version_info < (3, 9):
38-
warnings.warn("You are using a non-supported Python version " +
39-
f"({_py_version_str}). Google will not post any further " +
40-
f"updates to {_package_label} supporting this Python version. " +
41-
"Please upgrade to the latest Python version, or at " +
42-
f"least to Python 3.9, and then update {_package_label}.",
43-
FutureWarning)
44-
45-
print("***before Py 3.9 check") # was logging
46-
47-
if sys.version_info[:2] == (3, 9):
48-
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
49-
f"which Google will stop supporting in {_package_label} when " +
50-
"it reaches its end of life (October 2025). Please " +
51-
"upgrade to the latest Python version, or at " +
52-
"least Python 3.10, before then, and " +
53-
f"then update {_package_label}.",
54-
FutureWarning)
55-
56-
print("***before packaging import") # was logging
57-
58-
59-
from packaging.version import parse as parse_version
60-
61-
print("***before sys.version check for packaging") # was logging
62-
63-
if sys.version_info < (3, 8):
64-
65-
print("***defining package version for older version: before import") # was logging
66-
67-
import pkg_resources
68-
69-
print("***after importing pkg_resources") # was logging
70-
71-
def _get_version(dependency_name):
72-
try:
73-
version_string = pkg_resources.get_distribution(dependency_name).version
74-
return (parse_version(version_string), version_string)
75-
except pkg_resources.DistributionNotFound:
76-
return (None, "--")
77-
else:
78-
79-
print("***defining package version for newer version: before import") # was logging
80-
81-
from importlib import metadata
82-
83-
print("***after importing metadata") # was logging
84-
85-
86-
def _get_version(dependency_name):
87-
try:
88-
version_string = metadata.version("requests")
89-
parsed_version = parse_version(version_string)
90-
return (parsed_version.release, version_string)
91-
except metadata.PackageNotFoundError:
92-
return (None, "--")
93-
94-
95-
print("***before echoing package versions") # was logging
96-
97-
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
98-
(_version_used, _version_used_string) = _get_version(_dependency_package)
99-
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
100-
101-
_dependency_package = "google.protobuf"
102-
_next_supported_version = "4.25.8"
103-
_next_supported_version_tuple = (4, 25, 8)
104-
(_version_used, _version_used_string) = _get_version(_dependency_package)
105-
if _version_used and _version_used < _next_supported_version_tuple:
106-
pass
107-
# warnings.warn(f"Package {_package_label} depends on " +
108-
# f"{_dependency_package}, currently installed at version " +
109-
# f"{_version_used_string}. Future updates to " +
110-
# f"{_package_label} will require {_dependency_package} at " +
111-
# f"version {_next_supported_version} or higher. Please ensure " +
112-
# "that either (a) your Python environment doesn't pin the " +
113-
# f"version of {_dependency_package}, so that updates to " +
114-
# f"{_package_label} can require the higher version, or " +
115-
# "(b) you manually update your Python environment to use at " +
116-
# f"least version {_next_supported_version} of " +
117-
# f"{_dependency_package}.",
118-
# FutureWarning)
119-
except Exception as exception: # pragma: NO COVER
120-
print(f"Unexpected exception BEGIN vvvvvvvvvvvvvvvvvvvv:\n{exception}\nUnexpected exception END ^^^^^^^^^^^^^^^^^^^^")
12112

13+
# TODO: restore version checking
14+
12215
{# Import subpackages. -#}
12316
{% for subpackage, _ in api.subpackages|dictsort %}
12417
from . import {{ subpackage }}

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

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -19,105 +19,8 @@
1919

2020
# import logging
2121
import google.api_core as api_core
22-
try:
23-
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
24-
api_core.check_python_version("google.cloud.asset_v1") # type: ignore
25-
api_core.check_dependency_versions("google.cloud.asset_v1") # type: ignore
26-
else: # pragma: NO COVER
27-
# An older version of api_core is installed, which does not define the
28-
# functions above. We do equivalent checks manually.
2922

30-
print("***before imports") # was logging
31-
32-
import warnings
33-
import sys
34-
35-
_py_version_str = sys.version.split()[0]
36-
_package_label = "google.cloud.asset_v1"
37-
38-
print("***before old version check") # was logging
39-
40-
if sys.version_info < (3, 9):
41-
warnings.warn("You are using a non-supported Python version " +
42-
f"({_py_version_str}). Google will not post any further " +
43-
f"updates to {_package_label} supporting this Python version. " +
44-
"Please upgrade to the latest Python version, or at " +
45-
f"least to Python 3.9, and then update {_package_label}.",
46-
FutureWarning)
47-
48-
print("***before Py 3.9 check") # was logging
49-
50-
if sys.version_info[:2] == (3, 9):
51-
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
52-
f"which Google will stop supporting in {_package_label} when " +
53-
"it reaches its end of life (October 2025). Please " +
54-
"upgrade to the latest Python version, or at " +
55-
"least Python 3.10, before then, and " +
56-
f"then update {_package_label}.",
57-
FutureWarning)
58-
59-
print("***before packaging import") # was logging
60-
61-
from packaging.version import parse as parse_version
62-
63-
print("***before sys.version check for packaging") # was logging
64-
65-
if sys.version_info < (3, 8):
66-
67-
print("***defining package version for older version: before import") # was logging
68-
69-
import pkg_resources
70-
71-
print("***after importing pkg_resources") # was logging
72-
73-
def _get_version(dependency_name):
74-
try:
75-
version_string = pkg_resources.get_distribution(dependency_name).version
76-
return (parse_version(version_string), version_string)
77-
except pkg_resources.DistributionNotFound:
78-
return (None, "--")
79-
else:
80-
81-
print("***defining package version for newer version: before import") # was logging
82-
83-
from importlib import metadata
84-
85-
print("***after importing metadata") # was logging
86-
87-
def _get_version(dependency_name):
88-
try:
89-
version_string = metadata.version("requests")
90-
parsed_version = parse_version(version_string)
91-
return (parsed_version.release, version_string)
92-
except metadata.PackageNotFoundError:
93-
return (None, "--")
94-
95-
print("***before echoing package versions") # was logging
96-
97-
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
98-
(_version_used, _version_used_string) = _get_version(_dependency_package)
99-
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
100-
101-
_dependency_package = "google.protobuf"
102-
_next_supported_version = "4.25.8"
103-
_next_supported_version_tuple = (4, 25, 8)
104-
(_version_used, _version_used_string) = _get_version(_dependency_package)
105-
if _version_used and _version_used < _next_supported_version_tuple:
106-
pass
107-
# warnings.warn(f"Package {_package_label} depends on " +
108-
# f"{_dependency_package}, currently installed at version " +
109-
# f"{_version_used_string}. Future updates to " +
110-
# f"{_package_label} will require {_dependency_package} at " +
111-
# f"version {_next_supported_version} or higher. Please ensure " +
112-
# "that either (a) your Python environment doesn't pin the " +
113-
# f"version of {_dependency_package}, so that updates to " +
114-
# f"{_package_label} can require the higher version, or " +
115-
# "(b) you manually update your Python environment to use at " +
116-
# f"least version {_next_supported_version} of " +
117-
# f"{_dependency_package}.",
118-
# FutureWarning)
119-
except Exception as exception: # pragma: NO COVER
120-
print(f"Unexpected exception BEGIN vvvvvvvvvvvvvvvvvvvv:\n{exception}\nUnexpected exception END ^^^^^^^^^^^^^^^^^^^^")
23+
# TODO: restore version checking
12124

12225

12326
from .services.asset_service import AssetServiceClient

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

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -19,105 +19,8 @@
1919

2020
# import logging
2121
import google.api_core as api_core
22-
try:
23-
if hasattr(api_core, "check_python_version") and hasattr(api_core, "check_dependency_versions"): # pragma: NO COVER
24-
api_core.check_python_version("google.iam.credentials_v1") # type: ignore
25-
api_core.check_dependency_versions("google.iam.credentials_v1") # type: ignore
26-
else: # pragma: NO COVER
27-
# An older version of api_core is installed, which does not define the
28-
# functions above. We do equivalent checks manually.
2922

30-
print("***before imports") # was logging
31-
32-
import warnings
33-
import sys
34-
35-
_py_version_str = sys.version.split()[0]
36-
_package_label = "google.iam.credentials_v1"
37-
38-
print("***before old version check") # was logging
39-
40-
if sys.version_info < (3, 9):
41-
warnings.warn("You are using a non-supported Python version " +
42-
f"({_py_version_str}). Google will not post any further " +
43-
f"updates to {_package_label} supporting this Python version. " +
44-
"Please upgrade to the latest Python version, or at " +
45-
f"least to Python 3.9, and then update {_package_label}.",
46-
FutureWarning)
47-
48-
print("***before Py 3.9 check") # was logging
49-
50-
if sys.version_info[:2] == (3, 9):
51-
warnings.warn(f"You are using a Python version ({_py_version_str}) " +
52-
f"which Google will stop supporting in {_package_label} when " +
53-
"it reaches its end of life (October 2025). Please " +
54-
"upgrade to the latest Python version, or at " +
55-
"least Python 3.10, before then, and " +
56-
f"then update {_package_label}.",
57-
FutureWarning)
58-
59-
print("***before packaging import") # was logging
60-
61-
from packaging.version import parse as parse_version
62-
63-
print("***before sys.version check for packaging") # was logging
64-
65-
if sys.version_info < (3, 8):
66-
67-
print("***defining package version for older version: before import") # was logging
68-
69-
import pkg_resources
70-
71-
print("***after importing pkg_resources") # was logging
72-
73-
def _get_version(dependency_name):
74-
try:
75-
version_string = pkg_resources.get_distribution(dependency_name).version
76-
return (parse_version(version_string), version_string)
77-
except pkg_resources.DistributionNotFound:
78-
return (None, "--")
79-
else:
80-
81-
print("***defining package version for newer version: before import") # was logging
82-
83-
from importlib import metadata
84-
85-
print("***after importing metadata") # was logging
86-
87-
def _get_version(dependency_name):
88-
try:
89-
version_string = metadata.version("requests")
90-
parsed_version = parse_version(version_string)
91-
return (parsed_version.release, version_string)
92-
except metadata.PackageNotFoundError:
93-
return (None, "--")
94-
95-
print("***before echoing package versions") # was logging
96-
97-
for _dependency_package in ["aiohttp", "grpcio", "grpcio-status", "grpcgcp", "grpcio-gcp"]:
98-
(_version_used, _version_used_string) = _get_version(_dependency_package)
99-
print(f"*** Dependency: {_dependency_package} @ {_version_used_string}") # was logging
100-
101-
_dependency_package = "google.protobuf"
102-
_next_supported_version = "4.25.8"
103-
_next_supported_version_tuple = (4, 25, 8)
104-
(_version_used, _version_used_string) = _get_version(_dependency_package)
105-
if _version_used and _version_used < _next_supported_version_tuple:
106-
pass
107-
# warnings.warn(f"Package {_package_label} depends on " +
108-
# f"{_dependency_package}, currently installed at version " +
109-
# f"{_version_used_string}. Future updates to " +
110-
# f"{_package_label} will require {_dependency_package} at " +
111-
# f"version {_next_supported_version} or higher. Please ensure " +
112-
# "that either (a) your Python environment doesn't pin the " +
113-
# f"version of {_dependency_package}, so that updates to " +
114-
# f"{_package_label} can require the higher version, or " +
115-
# "(b) you manually update your Python environment to use at " +
116-
# f"least version {_next_supported_version} of " +
117-
# f"{_dependency_package}.",
118-
# FutureWarning)
119-
except Exception as exception: # pragma: NO COVER
120-
print(f"Unexpected exception BEGIN vvvvvvvvvvvvvvvvvvvv:\n{exception}\nUnexpected exception END ^^^^^^^^^^^^^^^^^^^^")
23+
# TODO: restore version checking
12124

12225

12326
from .services.iam_credentials import IAMCredentialsClient

0 commit comments

Comments
 (0)