Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 801a787

Browse files
vchudnov-gvchudnov-g
committed
fix: return package version as tuple of version tuple and string
1 parent 9a68c35 commit 801a787

File tree

20 files changed

+68
-56
lines changed

20 files changed

+68
-56
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,28 @@ else: # pragma: NO COVER
5353
def _get_version(dependency_name):
5454
try:
5555
version_string = pkg_resources.get_distribution(dependency_name).version
56-
return parse_version(version_string)
56+
return (parse_version(version_string), version_string)
5757
except pkg_resources.DistributionNotFound:
58-
return None
58+
return (None, "--")
5959
else:
6060
from importlib import metadata
6161

6262
def _get_version(dependency_name):
6363
try:
6464
version_string = metadata.version("requests")
6565
parsed_version = parse_version(version_string)
66-
return parsed_version.release
66+
return (parsed_version.release, version_string)
6767
except metadata.PackageNotFoundError:
68-
return None
68+
return (None, "--")
6969

7070
_dependency_package = "google.protobuf"
7171
_next_supported_version = "4.25.8"
7272
_next_supported_version_tuple = (4, 25, 8)
73-
_version_used = _get_version(_dependency_package)
73+
(_version_used, _version_used_string) = _get_version(_dependency_package)
7474
if _version_used and _version_used < _next_supported_version_tuple:
75-
warnings.warn(f"DEPRECATION: Package {_package_label} depends on " +
75+
warnings.warn(f"Package {_package_label} depends on " +
7676
f"{_dependency_package}, currently installed at version " +
77-
f"{_version_used.__str__()}. Future updates to " +
77+
f"{_version_used_string}. Future updates to " +
7878
f"{_package_label} will require {_dependency_package} at " +
7979
f"version {_next_supported_version} or higher. Please ensure " +
8080
"that either (a) your Python environment doesn't pin the " +

‎gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,7 @@ def test_{{ service.name|snake_case }}_transport_channel_mtls_with_client_cert_s
15171517

15181518
# Remove this test when deprecated arguments (api_mtls_endpoint, client_cert_source) are
15191519
# removed from grpc/grpc_asyncio transport constructor.
1520+
@pytest.mark.filterwarnings("ignore::FutureWarning")
15201521
@pytest.mark.parametrize("transport_class", [transports.{{ service.grpc_transport_name }}, transports.{{ service.grpc_asyncio_transport_name }}])
15211522
def test_{{ service.name|snake_case }}_transport_channel_mtls_with_adc(
15221523
transport_class

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,28 @@
5656
def _get_version(dependency_name):
5757
try:
5858
version_string = pkg_resources.get_distribution(dependency_name).version
59-
return parse_version(version_string)
59+
return (parse_version(version_string), version_string)
6060
except pkg_resources.DistributionNotFound:
61-
return None
61+
return (None, "--")
6262
else:
6363
from importlib import metadata
6464

6565
def _get_version(dependency_name):
6666
try:
6767
version_string = metadata.version("requests")
6868
parsed_version = parse_version(version_string)
69-
return parsed_version.release
69+
return (parsed_version.release, version_string)
7070
except metadata.PackageNotFoundError:
71-
return None
71+
return (None, "--")
7272

7373
_dependency_package = "google.protobuf"
7474
_next_supported_version = "4.25.8"
7575
_next_supported_version_tuple = (4, 25, 8)
76-
_version_used = _get_version(_dependency_package)
76+
(_version_used, _version_used_string) = _get_version(_dependency_package)
7777
if _version_used and _version_used < _next_supported_version_tuple:
78-
warnings.warn(f"DEPRECATION: Package {_package_label} depends on " +
78+
warnings.warn(f"Package {_package_label} depends on " +
7979
f"{_dependency_package}, currently installed at version " +
80-
f"{_version_used.__str__()}. Future updates to " +
80+
f"{_version_used_string}. Future updates to " +
8181
f"{_package_label} will require {_dependency_package} at " +
8282
f"version {_next_supported_version} or higher. Please ensure " +
8383
"that either (a) your Python environment doesn't pin the " +

‎tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17757,6 +17757,7 @@ def test_asset_service_transport_channel_mtls_with_client_cert_source(
1775717757

1775817758
# Remove this test when deprecated arguments (api_mtls_endpoint, client_cert_source) are
1775917759
# removed from grpc/grpc_asyncio transport constructor.
17760+
@pytest.mark.filterwarnings("ignore::FutureWarning")
1776017761
@pytest.mark.parametrize("transport_class", [transports.AssetServiceGrpcTransport, transports.AssetServiceGrpcAsyncIOTransport])
1776117762
def test_asset_service_transport_channel_mtls_with_adc(
1776217763
transport_class

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,28 @@
5656
def _get_version(dependency_name):
5757
try:
5858
version_string = pkg_resources.get_distribution(dependency_name).version
59-
return parse_version(version_string)
59+
return (parse_version(version_string), version_string)
6060
except pkg_resources.DistributionNotFound:
61-
return None
61+
return (None, "--")
6262
else:
6363
from importlib import metadata
6464

6565
def _get_version(dependency_name):
6666
try:
6767
version_string = metadata.version("requests")
6868
parsed_version = parse_version(version_string)
69-
return parsed_version.release
69+
return (parsed_version.release, version_string)
7070
except metadata.PackageNotFoundError:
71-
return None
71+
return (None, "--")
7272

7373
_dependency_package = "google.protobuf"
7474
_next_supported_version = "4.25.8"
7575
_next_supported_version_tuple = (4, 25, 8)
76-
_version_used = _get_version(_dependency_package)
76+
(_version_used, _version_used_string) = _get_version(_dependency_package)
7777
if _version_used and _version_used < _next_supported_version_tuple:
78-
warnings.warn(f"DEPRECATION: Package {_package_label} depends on " +
78+
warnings.warn(f"Package {_package_label} depends on " +
7979
f"{_dependency_package}, currently installed at version " +
80-
f"{_version_used.__str__()}. Future updates to " +
80+
f"{_version_used_string}. Future updates to " +
8181
f"{_package_label} will require {_dependency_package} at " +
8282
f"version {_next_supported_version} or higher. Please ensure " +
8383
"that either (a) your Python environment doesn't pin the " +

‎tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4017,6 +4017,7 @@ def test_iam_credentials_transport_channel_mtls_with_client_cert_source(
40174017

40184018
# Remove this test when deprecated arguments (api_mtls_endpoint, client_cert_source) are
40194019
# removed from grpc/grpc_asyncio transport constructor.
4020+
@pytest.mark.filterwarnings("ignore::FutureWarning")
40204021
@pytest.mark.parametrize("transport_class", [transports.IAMCredentialsGrpcTransport, transports.IAMCredentialsGrpcAsyncIOTransport])
40214022
def test_iam_credentials_transport_channel_mtls_with_adc(
40224023
transport_class

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,28 @@
5656
def _get_version(dependency_name):
5757
try:
5858
version_string = pkg_resources.get_distribution(dependency_name).version
59-
return parse_version(version_string)
59+
return (parse_version(version_string), version_string)
6060
except pkg_resources.DistributionNotFound:
61-
return None
61+
return (None, "--")
6262
else:
6363
from importlib import metadata
6464

6565
def _get_version(dependency_name):
6666
try:
6767
version_string = metadata.version("requests")
6868
parsed_version = parse_version(version_string)
69-
return parsed_version.release
69+
return (parsed_version.release, version_string)
7070
except metadata.PackageNotFoundError:
71-
return None
71+
return (None, "--")
7272

7373
_dependency_package = "google.protobuf"
7474
_next_supported_version = "4.25.8"
7575
_next_supported_version_tuple = (4, 25, 8)
76-
_version_used = _get_version(_dependency_package)
76+
(_version_used, _version_used_string) = _get_version(_dependency_package)
7777
if _version_used and _version_used < _next_supported_version_tuple:
78-
warnings.warn(f"DEPRECATION: Package {_package_label} depends on " +
78+
warnings.warn(f"Package {_package_label} depends on " +
7979
f"{_dependency_package}, currently installed at version " +
80-
f"{_version_used.__str__()}. Future updates to " +
80+
f"{_version_used_string}. Future updates to " +
8181
f"{_package_label} will require {_dependency_package} at " +
8282
f"version {_next_supported_version} or higher. Please ensure " +
8383
"that either (a) your Python environment doesn't pin the " +

‎tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15423,6 +15423,7 @@ def test_eventarc_transport_channel_mtls_with_client_cert_source(
1542315423

1542415424
# Remove this test when deprecated arguments (api_mtls_endpoint, client_cert_source) are
1542515425
# removed from grpc/grpc_asyncio transport constructor.
15426+
@pytest.mark.filterwarnings("ignore::FutureWarning")
1542615427
@pytest.mark.parametrize("transport_class", [transports.EventarcGrpcTransport, transports.EventarcGrpcAsyncIOTransport])
1542715428
def test_eventarc_transport_channel_mtls_with_adc(
1542815429
transport_class

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,28 @@
5656
def _get_version(dependency_name):
5757
try:
5858
version_string = pkg_resources.get_distribution(dependency_name).version
59-
return parse_version(version_string)
59+
return (parse_version(version_string), version_string)
6060
except pkg_resources.DistributionNotFound:
61-
return None
61+
return (None, "--")
6262
else:
6363
from importlib import metadata
6464

6565
def _get_version(dependency_name):
6666
try:
6767
version_string = metadata.version("requests")
6868
parsed_version = parse_version(version_string)
69-
return parsed_version.release
69+
return (parsed_version.release, version_string)
7070
except metadata.PackageNotFoundError:
71-
return None
71+
return (None, "--")
7272

7373
_dependency_package = "google.protobuf"
7474
_next_supported_version = "4.25.8"
7575
_next_supported_version_tuple = (4, 25, 8)
76-
_version_used = _get_version(_dependency_package)
76+
(_version_used, _version_used_string) = _get_version(_dependency_package)
7777
if _version_used and _version_used < _next_supported_version_tuple:
78-
warnings.warn(f"DEPRECATION: Package {_package_label} depends on " +
78+
warnings.warn(f"Package {_package_label} depends on " +
7979
f"{_dependency_package}, currently installed at version " +
80-
f"{_version_used.__str__()}. Future updates to " +
80+
f"{_version_used_string}. Future updates to " +
8181
f"{_package_label} will require {_dependency_package} at " +
8282
f"version {_next_supported_version} or higher. Please ensure " +
8383
"that either (a) your Python environment doesn't pin the " +

‎tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12942,6 +12942,7 @@ def test_config_service_v2_transport_channel_mtls_with_client_cert_source(
1294212942

1294312943
# Remove this test when deprecated arguments (api_mtls_endpoint, client_cert_source) are
1294412944
# removed from grpc/grpc_asyncio transport constructor.
12945+
@pytest.mark.filterwarnings("ignore::FutureWarning")
1294512946
@pytest.mark.parametrize("transport_class", [transports.ConfigServiceV2GrpcTransport, transports.ConfigServiceV2GrpcAsyncIOTransport])
1294612947
def test_config_service_v2_transport_channel_mtls_with_adc(
1294712948
transport_class

0 commit comments

Comments
 (0)