Also handle InvalidVersion

Author: notatallshaw

src/pip/_internal/exceptions.py

@@ -15,19 +15,19 @@
 from itertools import chain, groupby, repeat
 from typing import TYPE_CHECKING, Dict, Iterator, List, Literal, Optional, Union
 
+from pip._vendor.packaging.requirements import InvalidRequirement
+from pip._vendor.packaging.version import InvalidVersion
 from pip._vendor.rich.console import Console, ConsoleOptions, RenderResult
 from pip._vendor.rich.markup import escape
 from pip._vendor.rich.text import Text
 
 if TYPE_CHECKING:
     from hashlib import _Hash
 
-    from pip._vendor.packaging.requirements import InvalidRequirement
     from pip._vendor.requests.models import Request, Response
 
     from pip._internal.metadata import BaseDistribution
     from pip._internal.req.req_install import InstallRequirement
-    from pip._internal.resolution.resolvelib.candidates import AlreadyInstalledCandidate
 
 logger = logging.getLogger(__name__)
 
@@ -785,19 +785,25 @@ class InvalidInstalledPackage(DiagnosticPipError):
     def __init__(
         self,
         *,
-        package: "AlreadyInstalledCandidate",
-        invalid_req_exc: "InvalidRequirement",
+        dist: "BaseDistribution",
+        invalid_exc: Union[InvalidRequirement, InvalidVersion],
     ) -> None:
-        installed_location = package.dist.installed_location
+        installed_location = dist.installed_location
+
+        if isinstance(invalid_exc, InvalidRequirement):
+            invalid_type = "requirement"
+        else:
+            invalid_type = "version"
+
         super().__init__(
             message=Text(
-                f"Cannot process installed package {package} "
+                f"Cannot process installed package {dist} "
                 + (f"in {installed_location!r} " if installed_location else "")
-                + f"because it has an invalid requirement:\n{invalid_req_exc.args[0]}"
+                + f"because it has an invalid {invalid_type}:\n{invalid_exc.args[0]}"
             ),
             context=(
                 "Starting with pip 24.1, packages with invalid "
-                "requirements can not be processed."
+                f"{invalid_type}s can not be processed."
             ),
             hint_stmt=(
                 "To proceed this package must be uninstalled using 'pip<24.1', "

src/pip/_internal/resolution/resolvelib/candidates.py

@@ -404,7 +404,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen
             for r in self.dist.iter_dependencies():
                 yield from self._factory.make_requirements_from_spec(str(r), self._ireq)
         except InvalidRequirement as exc:
-            raise InvalidInstalledPackage(package=self, invalid_req_exc=exc) from None
+            raise InvalidInstalledPackage(dist=self.dist, invalid_exc=exc) from None
 
     def get_install_requirement(self) -> Optional[InstallRequirement]:
         return None

src/pip/_internal/resolution/resolvelib/factory.py

@@ -23,13 +23,14 @@
 from pip._vendor.packaging.requirements import InvalidRequirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
-from pip._vendor.packaging.version import Version
+from pip._vendor.packaging.version import InvalidVersion, Version
 from pip._vendor.resolvelib import ResolutionImpossible
 
 from pip._internal.cache import CacheEntry, WheelCache
 from pip._internal.exceptions import (
     DistributionNotFound,
     InstallationError,
+    InvalidInstalledPackage,
     MetadataInconsistent,
     MetadataInvalid,
     UnsupportedPythonVersion,
@@ -283,10 +284,15 @@ def _get_installed_candidate() -> Optional[Candidate]:
                 installed_dist = self._installed_dists[name]
             except KeyError:
                 return None
-            # Don't use the installed distribution if its version does not fit
-            # the current dependency graph.
-            if not specifier.contains(installed_dist.version, prereleases=True):
-                return None
+
+            try:
+                # Don't use the installed distribution if its version
+                # does not fit the current dependency graph.
+                if not specifier.contains(installed_dist.version, prereleases=True):
+                    return None
+            except InvalidVersion as e:
+                raise InvalidInstalledPackage(dist=installed_dist, invalid_exc=e)
+
             candidate = self._make_candidate_from_dist(
                 dist=installed_dist,
                 extras=extras,