Skip to content

Commit 8e76f3b

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: add support for google.cloud.apigateway.__version__ (#181)
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE feat: add support for `google.cloud.apigateway.__version__` fix(deps): require google-api-core >=1.33.2 fix: Add dict typing for client_options chore: update to gapic-generator-python 1.5.0 chore: use autogenerated setup.py END_COMMIT_OVERRIDE PiperOrigin-RevId: 484665853 Source-Link: https://togithub.com/googleapis/googleapis/commit/8eb249a19db926c2fbc4ecf1dc09c0e521a88b22 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/c8aa327b5f478865fc3fd91e3c2768e54e26ad44 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhhYTMyN2I1ZjQ3ODg2NWZjM2ZkOTFlM2MyNzY4ZTU0ZTI2YWQ0NCJ9
1 parent b993453 commit 8e76f3b

15 files changed

Lines changed: 181 additions & 42 deletions

File tree

‎packages/google-cloud-api-gateway/.github/release-please.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
releaseType: python
22
handleGHRelease: true
3+
manifest: true
34
# NOTE: this section is generated by synthtool.languages.python
45
# See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py
56
branches:

‎packages/google-cloud-api-gateway/.release-please-manifest.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "1.3.3"
3+
}

‎packages/google-cloud-api-gateway/google/cloud/apigateway/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
from google.cloud.apigateway import gapic_version as package_version
17+
18+
__version__ = package_version.__version__
19+
1620

1721
from google.cloud.apigateway_v1.services.api_gateway_service.async_client import (
1822
ApiGatewayServiceAsyncClient,

‎packages/google-cloud-api-gateway/google/cloud/apigateway/gapic_version.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2022 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
__version__ = "1.3.3" # {x-release-please-version}

‎packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
from google.cloud.apigateway import gapic_version as package_version
17+
18+
__version__ = package_version.__version__
19+
1620

1721
from .services.api_gateway_service import (
1822
ApiGatewayServiceAsyncClient,

‎packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from collections import OrderedDict
1717
import os
1818
import re
19-
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
19+
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast
2020

2121
from google.api_core import client_options as client_options_lib
2222
from google.api_core import exceptions as core_exceptions
@@ -435,7 +435,7 @@ def __init__(
435435
*,
436436
credentials: Optional[ga_credentials.Credentials] = None,
437437
transport: Union[str, ApiGatewayServiceTransport, None] = None,
438-
client_options: Optional[client_options_lib.ClientOptions] = None,
438+
client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
439439
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
440440
) -> None:
441441
"""Instantiates the api gateway service client.
@@ -449,7 +449,7 @@ def __init__(
449449
transport (Union[str, ApiGatewayServiceTransport]): The
450450
transport to use. If set to None, a transport is chosen
451451
automatically.
452-
client_options (google.api_core.client_options.ClientOptions): Custom options for the
452+
client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the
453453
client. It won't take effect if a ``transport`` instance is provided.
454454
(1) The ``api_endpoint`` property can be used to override the
455455
default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT
@@ -479,6 +479,7 @@ def __init__(
479479
client_options = client_options_lib.from_dict(client_options)
480480
if client_options is None:
481481
client_options = client_options_lib.ClientOptions()
482+
client_options = cast(client_options_lib.ClientOptions, client_options)
482483

483484
api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source(
484485
client_options

‎packages/google-cloud-api-gateway/owlbot.py‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Copyright 2022 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import json
16+
from pathlib import Path
17+
import shutil
18+
19+
import synthtool as s
20+
import synthtool.gcp as gcp
21+
from synthtool.languages import python
22+
23+
# ----------------------------------------------------------------------------
24+
# Copy the generated client from the owl-bot staging directory
25+
# ----------------------------------------------------------------------------
26+
27+
clean_up_generated_samples = True
28+
29+
# Load the default version defined in .repo-metadata.json.
30+
default_version = json.load(open(".repo-metadata.json", "rt")).get(
31+
"default_version"
32+
)
33+
34+
for library in s.get_staging_dirs(default_version):
35+
if clean_up_generated_samples:
36+
shutil.rmtree("samples/generated_samples", ignore_errors=True)
37+
clean_up_generated_samples = False
38+
s.move([library], excludes=["**/gapic_version.py"])
39+
s.remove_staging_dirs()
40+
41+
# ----------------------------------------------------------------------------
42+
# Add templated files
43+
# ----------------------------------------------------------------------------
44+
45+
templated_files = gcp.CommonTemplates().py_library(
46+
cov_level=100,
47+
microgenerator=True,
48+
versions=gcp.common.detect_versions(path="./google", default_first=True),
49+
)
50+
s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"])
51+
52+
python.py_samples(skip_readmes=True)
53+
54+
# run format session for all directories which have a noxfile
55+
for noxfile in Path(".").glob("**/noxfile.py"):
56+
s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False)

‎packages/google-cloud-api-gateway/release-please-config.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"packages": {
4+
".": {
5+
"release-type": "python",
6+
"extra-files": [
7+
"google/cloud/apigateway/gapic_version.py",
8+
{
9+
"type": "json",
10+
"path": "samples/generated_samples/snippet_metadata_apigateway_v1.json",
11+
"jsonpath": "$.clientLibrary.version"
12+
}
13+
]
14+
}
15+
},
16+
"release-type": "python",
17+
"plugins": [
18+
{
19+
"type": "sentence-case"
20+
}
21+
],
22+
"initial-version": "0.1.0"
23+
}

‎packages/google-cloud-api-gateway/setup.py‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
3-
# Copyright 2020 Google LLC
2+
# Copyright 2022 Google LLC
43
#
54
# Licensed under the Apache License, Version 2.0 (the "License");
65
# you may not use this file except in compliance with the License.
@@ -14,29 +13,51 @@
1413
# See the License for the specific language governing permissions and
1514
# limitations under the License.
1615
#
17-
1816
import io
1917
import os
2018

2119
import setuptools # type: ignore
2220

21+
package_root = os.path.abspath(os.path.dirname(__file__))
22+
2323
name = "google-cloud-api-gateway"
24-
version = "1.3.3"
25-
description = "API Gateway client library"
26-
release_status = "Development Status :: 5 - Production/Stable"
27-
url = "https://github.com/googleapis/python-api-gateway"
24+
25+
26+
description = "Google Cloud Api Gateway API client library"
27+
28+
version = {}
29+
with open(os.path.join(package_root, "google/cloud/apigateway/gapic_version.py")) as fp:
30+
exec(fp.read(), version)
31+
version = version["__version__"]
32+
33+
if version[0] == "0":
34+
release_status = "Development Status :: 4 - Beta"
35+
else:
36+
release_status = "Development Status :: 5 - Production/Stable"
37+
2838
dependencies = [
29-
"google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
39+
"google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
3040
"proto-plus >= 1.22.0, <2.0.0dev",
3141
"protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
3242
]
43+
url = "https://github.com/googleapis/python-api-gateway"
3344

3445
package_root = os.path.abspath(os.path.dirname(__file__))
3546

3647
readme_filename = os.path.join(package_root, "README.rst")
3748
with io.open(readme_filename, encoding="utf-8") as readme_file:
3849
readme = readme_file.read()
3950

51+
packages = [
52+
package
53+
for package in setuptools.PEP420PackageFinder.find()
54+
if package.startswith("google")
55+
]
56+
57+
namespaces = ["google"]
58+
if "google.cloud" in packages:
59+
namespaces.append("google.cloud")
60+
4061
setuptools.setup(
4162
name=name,
4263
version=version,
@@ -46,26 +67,24 @@
4667
author_email="googleapis-packages@google.com",
4768
license="Apache 2.0",
4869
url=url,
49-
packages=[
50-
package
51-
for package in setuptools.PEP420PackageFinder.find()
52-
if package.startswith("google")
53-
],
54-
namespace_packages=("google", "google.cloud"),
55-
platforms="Posix; MacOS X; Windows",
56-
include_package_data=True,
57-
install_requires=dependencies,
58-
python_requires=">=3.7",
5970
classifiers=[
6071
release_status,
6172
"Intended Audience :: Developers",
62-
"Operating System :: OS Independent",
73+
"License :: OSI Approved :: Apache Software License",
74+
"Programming Language :: Python",
75+
"Programming Language :: Python :: 3",
6376
"Programming Language :: Python :: 3.7",
6477
"Programming Language :: Python :: 3.8",
6578
"Programming Language :: Python :: 3.9",
6679
"Programming Language :: Python :: 3.10",
80+
"Operating System :: OS Independent",
6781
"Topic :: Internet",
68-
"Topic :: Software Development :: Libraries :: Python Modules",
6982
],
83+
platforms="Posix; MacOS X; Windows",
84+
packages=packages,
85+
python_requires=">=3.7",
86+
namespace_packages=namespaces,
87+
install_requires=dependencies,
88+
include_package_data=True,
7089
zip_safe=False,
7190
)

‎packages/google-cloud-api-gateway/testing/constraints-3.10.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# -*- coding: utf-8 -*-
2+
# This constraints file is required for unit tests.
3+
# List all library dependencies and extras in this file.
4+
google-api-core
5+
proto-plus
6+
protobuf

0 commit comments

Comments
 (0)