Merge pull request #127 from finswimmer/drop-legacy-version

fix: catch `InvalidVersion` instead of handling `LegacyVersion`
sarugaku · Feb 5, 2023 · d901f21 · d901f21
2 parents 374e1d3 + e9ff279
commit d901f21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -39,7 +39,7 @@ package_data =
 install_requires =
     attrs
     cached-property
-    packaging
+    packaging>=22.0
 
 [options.packages.find]
 where = src

diff --git a/src/pythonfinder/utils.py b/src/pythonfinder/utils.py
@@ -9,7 +9,7 @@
 from threading import Timer
 
 import attr
-from packaging.version import LegacyVersion, Version
+from packaging.version import Version, InvalidVersion
 
 from .compat import Path, TimeoutError, lru_cache  # noqa
 from .environment import MYPY_RUNNING, PYENV_ROOT, SUBPROCESS_TIMEOUT
@@ -130,12 +130,15 @@ def parse_python_version(version_str):
     is_devrelease = True if version_dict.get("dev") else False
     if patch:
         patch = int(patch)
-    version = None  # type: Optional[Union[Version, LegacyVersion]]
+
+    version = None  # type: Optional[Version]
+
     try:
         version = parse_version(version_str)
-    except TypeError:
+    except (TypeError, InvalidVersion):
         version = None
-    if isinstance(version, LegacyVersion) or version is None:
+
+    if version is None:
         v_dict = version_dict.copy()
         pre = ""
         if v_dict.get("prerel") and v_dict.get("prerelversion"):