Merge pull request django-extensions#1588 from mplumador/pipchecker-retry

trbs · web-flow · commit 9a126b64aea9 · 2020-10-01T10:25:04.000+02:00
Pipchecker retry
diff --git a/django_extensions/management/commands/pipchecker.py b/django_extensions/management/commands/pipchecker.py
@@ -6,9 +6,10 @@
 from urllib.parse import urlparse
 from urllib.error import HTTPError
 from urllib.request import Request, urlopen
-from xmlrpc.client import ServerProxy
+from xmlrpc.client import ServerProxy, Fault
 
 import pip
+from time import sleep
 from django.core.management.base import BaseCommand, CommandError
 from django_extensions.management.color import color_style
 from django_extensions.management.utils import signalcommand
@@ -145,7 +146,17 @@ def check_pypi(self):
             elif "dist" in req:
                 dist = req["dist"]
                 dist_version = LooseVersion(dist.version)
-                available = pypi.package_releases(req["pip_req"].name, True) or pypi.package_releases(req["pip_req"].name.replace('-', '_'), True)
+                retry = True
+                available = None
+                while retry:
+                    try:
+                        available = pypi.package_releases(req["pip_req"].name, True) or pypi.package_releases(req["pip_req"].name.replace('-', '_'), True)
+                        retry = False
+                    except Fault as err:
+                        self.stdout.write(err.faultString)
+                        self.stdout.write("Retrying in 60 seconds!")
+                        sleep(60)
+
                 available_version = self._available_version(dist_version, available)
 
                 if not available_version:
diff --git a/tests/management/commands/test_pipchecker.py b/tests/management/commands/test_pipchecker.py
@@ -115,3 +115,57 @@ def test_pipchecker_with_outdated_requirement_on_pip20_1(self):
         os.remove(requirements_path)
 
         self.assertTrue(value.endswith('available\n'))
+
+    def test_pipchecker_with_long_up_to_date_requirements(self):
+        requirements_path = './requirements.txt'
+        out = StringIO()
+
+        f = open(requirements_path, 'wt')
+        f.write('appdirs')
+        f.write('asgiref')
+        f.write('attrs')
+        f.write('black')
+        f.write('certifi')
+        f.write('chardet')
+        f.write('click')
+        f.write('distlib')
+        f.write('Django')
+        f.write('django-cors-headers')
+        f.write('django-debug-toolbar')
+        f.write('djangorestframework')
+        f.write('filelock')
+        f.write('idna')
+        f.write('iniconfig')
+        f.write('mypy-extensions')
+        f.write('packaging')
+        f.write('pathspec')
+        f.write('Pillow')
+        f.write('pluggy')
+        f.write('psycopg2-binary')
+        f.write('py')
+        f.write('pyparsing')
+        f.write('pytest')
+        f.write('pytz')
+        f.write('regex')
+        f.write('requests')
+        f.write('sentry-sdk')
+        f.write('shortuuid')
+        f.write('six')
+        f.write('sqlparse')
+        f.write('toml')
+        f.write('typed-ast')
+        f.write('typing-extensions')
+        f.write('urllib3')
+        f.write('whitenoise')
+        f.write('zipp')
+
+        subprocess.call([sys.executable, '-m', 'pip', 'install', '-r', requirements_path])
+        pip._vendor.pkg_resources = importlib.reload(pip._vendor.pkg_resources)
+        call_command('pipchecker', '-r', requirements_path, stdout=out)
+
+        value = out.getvalue()
+
+        subprocess.call([sys.executable, '-m', 'pip', 'uninstall', '--yes', '-r', requirements_path])
+        os.remove(requirements_path)
+
+        self.assertTrue(value.endswith("Retrying in 60 seconds!") or value == '')
