feat: add support for google.cloud.apigeeconnect.__version__ (#153)

- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE feat: add support for `google.cloud.apigeeconnect.__version__` fix: Add dict typing for client_options chore: use autogenerated setup.py chore: update to gapic-generator-python 1.5.0 fix(deps): require google-api-core >=1.33.2 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

Author: gcf-owl-bot[bot]

.github/release-please.yml

@@ -1,5 +1,6 @@
 releaseType: python
 handleGHRelease: true
+manifest: true
 # NOTE: this section is generated by synthtool.languages.python
 # See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py
 branches:

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+ ".": "1.4.3"
+}

google/cloud/apigeeconnect/__init__.py

@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.cloud.apigeeconnect import gapic_version as package_version
+
+__version__ = package_version.__version__
+
 
 from google.cloud.apigeeconnect_v1.services.connection_service.async_client import (
  ConnectionServiceAsyncClient,

google/cloud/apigeeconnect/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "1.4.3" # {x-release-please-version}

google/cloud/apigeeconnect_v1/__init__.py

@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.cloud.apigeeconnect import gapic_version as package_version
+
+__version__ = package_version.__version__
+
 
 from .services.connection_service import (
  ConnectionServiceAsyncClient,

google/cloud/apigeeconnect_v1/services/connection_service/client.py

@@ -16,7 +16,7 @@
 from collections import OrderedDict
 import os
 import re
-from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
+from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast
 
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
@@ -331,7 +331,7 @@ def __init__(
  *,
  credentials: Optional[ga_credentials.Credentials] = None,
  transport: Union[str, ConnectionServiceTransport, None] = None,
- client_options: Optional[client_options_lib.ClientOptions] = None,
+ client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  ) -> None:
  """Instantiates the connection service client.
@@ -345,7 +345,7 @@ def __init__(
  transport (Union[str, ConnectionServiceTransport]): The
  transport to use. If set to None, a transport is chosen
  automatically.
- client_options (google.api_core.client_options.ClientOptions): Custom options for the
+ client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the
  client. It won't take effect if a ``transport`` instance is provided.
  (1) The ``api_endpoint`` property can be used to override the
  default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT
@@ -375,6 +375,7 @@ def __init__(
  client_options = client_options_lib.from_dict(client_options)
  if client_options is None:
  client_options = client_options_lib.ClientOptions()
+ client_options = cast(client_options_lib.ClientOptions, client_options)
 
  api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source(
  client_options

google/cloud/apigeeconnect_v1/services/tether/client.py

@@ -26,6 +26,7 @@
  Tuple,
  Type,
  Union,
+ cast,
 )
 
 from google.api_core import client_options as client_options_lib
@@ -325,7 +326,7 @@ def __init__(
  *,
  credentials: Optional[ga_credentials.Credentials] = None,
  transport: Union[str, TetherTransport, None] = None,
- client_options: Optional[client_options_lib.ClientOptions] = None,
+ client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  ) -> None:
  """Instantiates the tether client.
@@ -339,7 +340,7 @@ def __init__(
  transport (Union[str, TetherTransport]): The
  transport to use. If set to None, a transport is chosen
  automatically.
- client_options (google.api_core.client_options.ClientOptions): Custom options for the
+ client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the
  client. It won't take effect if a ``transport`` instance is provided.
  (1) The ``api_endpoint`` property can be used to override the
  default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT
@@ -369,6 +370,7 @@ def __init__(
  client_options = client_options_lib.from_dict(client_options)
  if client_options is None:
  client_options = client_options_lib.ClientOptions()
+ client_options = cast(client_options_lib.ClientOptions, client_options)
 
  api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source(
  client_options

owlbot.py

@@ -0,0 +1,56 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+from pathlib import Path
+import shutil
+
+import synthtool as s
+import synthtool.gcp as gcp
+from synthtool.languages import python
+
+# ----------------------------------------------------------------------------
+# Copy the generated client from the owl-bot staging directory
+# ----------------------------------------------------------------------------
+
+clean_up_generated_samples = True
+
+# Load the default version defined in .repo-metadata.json.
+default_version = json.load(open(".repo-metadata.json", "rt")).get(
+ "default_version"
+)
+
+for library in s.get_staging_dirs(default_version):
+ if clean_up_generated_samples:
+ shutil.rmtree("samples/generated_samples", ignore_errors=True)
+ clean_up_generated_samples = False
+ s.move([library], excludes=["**/gapic_version.py"])
+s.remove_staging_dirs()
+
+# ----------------------------------------------------------------------------
+# Add templated files
+# ----------------------------------------------------------------------------
+
+templated_files = gcp.CommonTemplates().py_library(
+ cov_level=100,
+ microgenerator=True,
+ versions=gcp.common.detect_versions(path="./google", default_first=True),
+)
+s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"])
+
+python.py_samples(skip_readmes=True)
+
+# run format session for all directories which have a noxfile
+for noxfile in Path(".").glob("**/noxfile.py"):
+ s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False)

release-please-config.json

@@ -0,0 +1,23 @@
+{
+ "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+ "packages": {
+ ".": {
+ "release-type": "python",
+ "extra-files": [
+ "google/cloud/apigeeconnect/gapic_version.py",
+ {
+ "type": "json",
+ "path": "samples/generated_samples/snippet_metadata_apigeeconnect_v1.json",
+ "jsonpath": "$.clientLibrary.version"
+ }
+ ]
+ }
+ },
+ "release-type": "python",
+ "plugins": [
+ {
+ "type": "sentence-case"
+ }
+ ],
+ "initial-version": "0.1.0"
+}

setup.py

@@ -1,34 +1,48 @@
 # -*- coding: utf-8 -*-
-#
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# https://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
 import io
 import os
 
-import setuptools
+import setuptools # type: ignore
+
+package_root = os.path.abspath(os.path.dirname(__file__))
 
 name = "google-cloud-apigee-connect"
-description = "Apigee Connect API client library"
-version = "1.4.3"
-release_status = "Development Status :: 5 - Production/Stable"
-url = "https://github.com/googleapis/python-apigee-connect"
+
+
+description = "Google Cloud Apigee Connect API client library"
+
+version = {}
+with open(
+ os.path.join(package_root, "google/cloud/apigeeconnect/gapic_version.py")
+) as fp:
+ exec(fp.read(), version)
+version = version["__version__"]
+
+if version[0] == "0":
+ release_status = "Development Status :: 4 - Beta"
+else:
+ release_status = "Development Status :: 5 - Production/Stable"
+
 dependencies = [
- "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.*",
+ "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.*",
  "proto-plus >= 1.22.0, <2.0.0dev",
  "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",
 ]
+url = "https://github.com/googleapis/python-apigee-connect"
 
 package_root = os.path.abspath(os.path.dirname(__file__))
 
@@ -46,7 +60,6 @@
 if "google.cloud" in packages:
  namespaces.append("google.cloud")
 
-
 setuptools.setup(
  name=name,
  version=version,