Merge pull request #9599 from cjc7373/switch-to-tenacity

Author: uranusjr

Diff for: news/tenacity.vendor.rst

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

Diff for: pyproject.toml

@@ -44,6 +44,8 @@ drop = [
   "setuptools",
   "pkg_resources/_vendor/",
   "pkg_resources/extern/",
+  # unneeded part for tenacity
+  "tenacity/tests",
 ]
 
 [tool.vendoring.typing-stubs]

Diff for: src/pip/_internal/utils/filesystem.py

@@ -9,9 +9,7 @@
 from tempfile import NamedTemporaryFile
 from typing import Any, BinaryIO, Iterator, List, Union, cast
 
-# 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
@@ -100,7 +98,8 @@ def adjacent_tmp_file(path, **kwargs):
             os.fsync(result.fileno())
 
 
-_replace_retry = retry(stop_max_delay=1000, wait_fixed=250)
+# Tenacity raises RetryError by default, explictly raise the original exception
+_replace_retry = retry(reraise=True, stop=stop_after_delay(1), wait=wait_fixed(0.25))
 
 replace = _replace_retry(os.replace)
 

Diff for: src/pip/_internal/utils/misc.py

@@ -35,10 +35,7 @@
 )
 
 from pip._vendor.pkg_resources import Distribution
-
-# 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
@@ -131,7 +128,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, onerror=rmtree_errorhandler)

Diff for: src/pip/_vendor/__init__.py

@@ -75,7 +75,6 @@ def vendored(modulename):
     vendored("pep517")
     vendored("pkg_resources")
     vendored("progress")
-    vendored("retrying")
     vendored("requests")
     vendored("requests.exceptions")
     vendored("requests.packages")
@@ -107,6 +106,7 @@ def vendored(modulename):
     vendored("requests.packages.urllib3.util.timeout")
     vendored("requests.packages.urllib3.util.url")
     vendored("resolvelib")
+    vendored("tenacity")
     vendored("toml")
     vendored("toml.encoder")
     vendored("toml.decoder")

Diff for: src/pip/_vendor/retrying.py

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