diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-22 14:03:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-22 14:03:49 +0000 |
| commit | 39e5930b0f1d5942ade58752948ac59cc6ceb17e (patch) | |
| tree | 512fb77d1d5c45ec43bdcf9d8192afcd2639f678 | |
| parent | ba16eadd8b2fdd95752a12f3c78791698017cfa6 (diff) | |
| parent | 5fbb63fa4ff399624fdadd0adc63b35dfb527116 (diff) | |
| download | tooz-39e5930b0f1d5942ade58752948ac59cc6ceb17e.tar.gz | |
Merge "Support later tenacity versions"
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tooz/_retry.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index 99a915a..98dec56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ stevedore>=1.16.0 # Apache-2.0 voluptuous>=0.8.9 # BSD License msgpack>=0.4.0 # Apache-2.0 fasteners>=0.7 # Apache-2.0 -tenacity>=3.2.1,<7.0.0 # Apache-2.0 +tenacity>=3.2.1 # Apache-2.0 futurist>=1.2.0 # Apache-2.0 oslo.utils>=4.7.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 diff --git a/tooz/_retry.py b/tooz/_retry.py index 0fa7e95..e799e79 100644 --- a/tooz/_retry.py +++ b/tooz/_retry.py @@ -22,7 +22,7 @@ _default_wait = wait.wait_exponential(max=1) def retry(stop_max_delay=None, **kwargs): - k = {"wait": _default_wait, "retry": lambda x: False} + k = {"wait": _default_wait, "retry": tenacity.retry_never} if stop_max_delay not in (True, False, None): k['stop'] = stop.stop_after_delay(stop_max_delay) return tenacity.retry(**k) |