Merge branch 'main' into debt/remove-legacy-version

1 files changed, 7 insertions, 5 deletions

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index bef2ef81..24a7f306 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -21,7 +21,7 @@ import setuptools
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     Environment, find_distributions, safe_name, safe_version,
-    to_filename, Requirement, DEVELOP_DIST, EGG_DIST,
+    to_filename, Requirement, DEVELOP_DIST, EGG_DIST, parse_version,
 )
 from distutils import log
 from distutils.errors import DistutilsError
@@ -281,7 +281,7 @@ class PackageIndex(Environment):
             self, index_url="https://pypi.org/simple/", hosts=('*',),
             ca_bundle=None, verify_ssl=True, *args, **kw
     ):
-        Environment.__init__(self, *args, **kw)
+        super().__init__(*args, **kw)
         self.index_url = index_url + "/" [:not index_url.endswith('/')]
         self.scanned_urls = {}
         self.fetched_urls = {}
@@ -291,8 +291,10 @@ class PackageIndex(Environment):
         self.opener = urllib.request.urlopen
 
     def add(self, dist):
-        # ignore invalid pbr version
-        if dist.version == '0.5.2.5.g5b3e942':
+        # ignore invalid versions
+        try:
+            parse_version(dist.version)
+        except Exception:
             return
         return super().add(dist)
 
@@ -996,7 +998,7 @@ class PyPIConfig(configparser.RawConfigParser):
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        configparser.RawConfigParser.__init__(self, defaults)
+        super().__init__(defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):