switch from 'retrying' to 'tenacity'

Author: cjc7373

news/tenacity.vendor.rst

@@ -0,0 +1,2 @@
+Switch from retrying to tenacity
+

src/pip/_internal/utils/filesystem.py

@@ -8,9 +8,7 @@
 from contextlib import contextmanager
 from tempfile import NamedTemporaryFile
 
-# NOTE: retrying is not annotated in typeshed as on 2017-07-17, which is
-#       why we ignore the type on this import.
-from pip._vendor.retrying import retry  # type: ignore
+from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
 
 from pip._internal.utils.compat import get_path_uid
 from pip._internal.utils.misc import format_size
@@ -104,7 +102,7 @@ def adjacent_tmp_file(path, **kwargs):
             os.fsync(result.fileno())
 
 
-_replace_retry = retry(stop_max_delay=1000, wait_fixed=250)
+_replace_retry = retry(reraise=True, stop=stop_after_delay(1), wait=wait_fixed(0.25))
 
 replace = _replace_retry(os.replace)
 

src/pip/_internal/utils/misc.py

@@ -18,10 +18,7 @@
 from itertools import filterfalse, tee, zip_longest
 
 from pip._vendor import pkg_resources
-
-# NOTE: retrying is not annotated in typeshed as on 2017-07-17, which is
-#       why we ignore the type on this import.
-from pip._vendor.retrying import retry  # type: ignore
+from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
 
 from pip import __version__
 from pip._internal.exceptions import CommandError
@@ -122,7 +119,8 @@ def get_prog():
 
 
 # Retry every half second for up to 3 seconds
-@retry(stop_max_delay=3000, wait_fixed=500)
+# Tenacity raises RetryError by default, explictly raise the original exception
+@retry(reraise=True, stop=stop_after_delay(3), wait=wait_fixed(0.5))
 def rmtree(dir, ignore_errors=False):
     # type: (AnyStr, bool) -> None
     shutil.rmtree(dir, ignore_errors=ignore_errors,

src/pip/_vendor/retrying.py

@@ -0,0 +1 @@
+from tenacity import *