From ac012c04c69b8bbe72962f0d0d9e9536c0b4a524 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 30 Jan 2024 13:40:05 -0500
Subject: [PATCH 1/2] fix: fix broken import for
 google.api_core.retry_async.AsyncRetry (#587)

* fix: fix broken import for AsyncRetry

* fix import for AsyncRetry

* Resolve duplicate object description of google.api_core.retry.retry_unary_async.AsyncRetry

* move to google/api_core/retry_async.py
---
 docs/retry.rst                         |  1 +
 google/api_core/__init__.py            |  3 ---
 google/api_core/retry_async.py         | 34 ++++++++++++++++++++++++++
 tests/unit/retry/test_retry_imports.py |  4 +++
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 google/api_core/retry_async.py

diff --git a/docs/retry.rst b/docs/retry.rst
index 97a7f2ca..6e165f56 100644
--- a/docs/retry.rst
+++ b/docs/retry.rst
@@ -10,4 +10,5 @@ Retry in AsyncIO
 
 .. automodule:: google.api_core.retry_async
   :members:
+  :noindex:
   :show-inheritance:
diff --git a/google/api_core/__init__.py b/google/api_core/__init__.py
index 89ce7510..b80ea372 100644
--- a/google/api_core/__init__.py
+++ b/google/api_core/__init__.py
@@ -20,6 +20,3 @@
 from google.api_core import version as api_core_version
 
 __version__ = api_core_version.__version__
-
-# for backwards compatibility, expose async unary retries as google.api_core.retry_async
-from .retry import retry_unary_async as retry_async  # noqa: F401
diff --git a/google/api_core/retry_async.py b/google/api_core/retry_async.py
new file mode 100644
index 00000000..90a2d5ad
--- /dev/null
+++ b/google/api_core/retry_async.py
@@ -0,0 +1,34 @@
+# Copyright 2024 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.
+#
+# The following imports are for backwards compatibility with https://github.com/googleapis/python-api-core/blob/4d7d2edee2c108d43deb151e6e0fdceb56b73275/google/api_core/retry_async.py
+#
+# TODO: Revert these imports on the next major version release (https://github.com/googleapis/python-api-core/issues/576)
+from google.api_core import datetime_helpers  # noqa: F401
+from google.api_core import exceptions  # noqa: F401
+from google.api_core.retry import exponential_sleep_generator  # noqa: F401
+from google.api_core.retry import if_exception_type  # noqa: F401
+from google.api_core.retry import if_transient_error  # noqa: F401
+from google.api_core.retry.retry_unary_async import AsyncRetry
+from google.api_core.retry.retry_unary_async import retry_target
+
+__all__ = (
+    "AsyncRetry",
+    "datetime_helpers",
+    "exceptions",
+    "exponential_sleep_generator",
+    "if_exception_type",
+    "if_transient_error",
+    "retry_target",
+)
diff --git a/tests/unit/retry/test_retry_imports.py b/tests/unit/retry/test_retry_imports.py
index 5d035be4..597909fc 100644
--- a/tests/unit/retry/test_retry_imports.py
+++ b/tests/unit/retry/test_retry_imports.py
@@ -27,3 +27,7 @@ def test_legacy_imports_retry_unary_async():
     #       next major version release
     #       (https://github.com/googleapis/python-api-core/issues/576)
     from google.api_core import retry_async  # noqa: F401
+
+    # See https://github.com/googleapis/python-api-core/issues/586
+    # for context on why we need to test this import this explicitly.
+    from google.api_core.retry_async import AsyncRetry  # noqa: F401

From 5922f2b8f382ee1fd9b69fafb2eed39db93b60fb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:35:42 -0500
Subject: [PATCH 2/2] chore(main): release 2.16.1 (#588)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md               | 7 +++++++
 google/api_core/version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac7a93b..3eef4fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 [1]: https://pypi.org/project/google-api-core/#history
 
+## [2.16.1](https://github.com/googleapis/python-api-core/compare/v2.16.0...v2.16.1) (2024-01-30)
+
+
+### Bug Fixes
+
+* Fix broken import for google.api_core.retry_async.AsyncRetry ([#587](https://github.com/googleapis/python-api-core/issues/587)) ([ac012c0](https://github.com/googleapis/python-api-core/commit/ac012c04c69b8bbe72962f0d0d9e9536c0b4a524))
+
 ## [2.16.0](https://github.com/googleapis/python-api-core/compare/v2.15.0...v2.16.0) (2024-01-29)
 
 
diff --git a/google/api_core/version.py b/google/api_core/version.py
index a93d72c2..61e0c0a8 100644
--- a/google/api_core/version.py
+++ b/google/api_core/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.16.0"
+__version__ = "2.16.1"