Drop tenacity dependency; use google.api.core.retry in google.api.core.future

Author: Jon Wayne Parrott

core/google/api/core/future/polling.py

@@ -16,16 +16,18 @@
 
 import abc
 import concurrent.futures
-import functools
-import operator
-
-import six
-import tenacity
 
+from google.api.core import exceptions
+from google.api.core import retry
 from google.api.core.future import _helpers
 from google.api.core.future import base
 
 
+class _OperationNotComplete(Exception):
+    """Private exception used for polling via retry."""
+    pass
+
+
 class PollingFuture(base.Future):
     """A Future that needs to poll some service to check its status.
 
@@ -69,29 +71,21 @@ def _blocking_poll(self, timeout=None):
         if self._result_set:
             return
 
-        retry_on = tenacity.retry_if_result(
-            functools.partial(operator.is_not, True))
-        # Use exponential backoff with jitter.
-        wait_on = (
-            tenacity.wait_exponential(multiplier=1, max=10) +
-            tenacity.wait_random(0, 1))
-
-        if timeout is None:
-            retry = tenacity.retry(retry=retry_on, wait=wait_on)
-        else:
-            retry = tenacity.retry(
-                retry=retry_on,
-                wait=wait_on,
-                stop=tenacity.stop_after_delay(timeout))
+        def done_or_raise():
+            """Checks if the future is done and raises if it's not."""
+            if not self.done():
+                raise _OperationNotComplete()
+
+        retry_ = retry.Retry(
+            predicate=retry.if_exception_type(_OperationNotComplete),
+            deadline=timeout)
 
         try:
-            retry(self.done)()
-        except tenacity.RetryError as exc:
-            six.raise_from(
-                concurrent.futures.TimeoutError(
-                    'Operation did not complete within the designated '
-                    'timeout.'),
-                exc)
+            retry_(done_or_raise)()
+        except exceptions.RetryError:
+            raise concurrent.futures.TimeoutError(
+                'Operation did not complete within the designated '
+                'timeout.')
 
     def result(self, timeout=None):
         """Get the result of the operation, blocking if necessary.

core/setup.py

@@ -57,7 +57,6 @@
     'requests >= 2.18.0, < 3.0.0dev',
     'setuptools >= 34.0.0',
     'six',
-    'tenacity >= 4.0.0, <5.0.0dev'
 ]
 
 EXTRAS_REQUIREMENTS = {