remove pkg_resources and replace with packaging.version

Saelra · Saelra · commit 77207ad46345 · 2024-07-20T11:31:55.000-07:00
diff --git a/monai/utils/module.py b/monai/utils/module.py
@@ -27,9 +27,13 @@
 from re import match
 from types import FunctionType, ModuleType
 from typing import Any, Iterable, cast
-
 import torch
 
+import importlib.metadata
+from packaging import version
+from packaging.version import Version, parse
+
+
 # bundle config system flags
 # set MONAI_EVAL_EXPR=1 to use 'eval', default value: run_eval=True
 run_eval = os.environ.get("MONAI_EVAL_EXPR", "1") != "0"
@@ -564,11 +568,14 @@ def version_leq(lhs: str, rhs: str) -> bool:
     """
 
     lhs, rhs = str(lhs), str(rhs)
-    pkging, has_ver = optional_import("pkg_resources", name="packaging")
+    pkging, has_ver = optional_import("packaging", name="packaging")
+    # pkging, has_ver = optional_import("pkg_resources", name="packaging")
     if has_ver:
         try:
-            return cast(bool, pkging.version.Version(lhs) <= pkging.version.Version(rhs))
-        except pkging.version.InvalidVersion:
+            return cast(bool, version(lhs) <= version(rhs))
+            # return cast(bool, pkging.version.Version(lhs) <= pkging.version.Version(rhs))
+        except version.InvalidVersion:
+        # except pkging.version.InvalidVersion:
             return True
 
     lhs_, rhs_ = parse_version_strs(lhs, rhs)
@@ -591,11 +598,14 @@ def version_geq(lhs: str, rhs: str) -> bool:
 
     """
     lhs, rhs = str(lhs), str(rhs)
-    pkging, has_ver = optional_import("pkg_resources", name="packaging")
+    pkging, has_ver = optional_import("packaging", name="packaging")
+    # pkging, has_ver = optional_import("pkg_resources", name="packaging")
     if has_ver:
         try:
-            return cast(bool, pkging.version.Version(lhs) >= pkging.version.Version(rhs))
-        except pkging.version.InvalidVersion:
+            return cast(bool, version(lhs) >= version(rhs))
+            # return cast(bool, pkging.version.Version(lhs) >= pkging.version.Version(rhs))
+        except version.InvalidVersion:
+        # except pkging.version.InvalidVersion:
             return True
 
     lhs_, rhs_ = parse_version_strs(lhs, rhs)
@@ -629,7 +639,8 @@ def pytorch_after(major: int, minor: int, patch: int = 0, current_ver_string: st
         if current_ver_string is None:
             _env_var = os.environ.get("PYTORCH_VER", "")
             current_ver_string = _env_var if _env_var else torch.__version__
-        ver, has_ver = optional_import("pkg_resources", name="parse_version")
+        ver, has_ver = optional_import("packaging.version", name="parse")
+        # ver, has_ver = optional_import("pkg_resources", name="parse_version")
         if has_ver:
             return ver(".".join((f"{major}", f"{minor}", f"{patch}"))) <= ver(f"{current_ver_string}")  # type: ignore
         parts = f"{current_ver_string}".split("+", 1)[0].split(".", 3)
diff --git a/setup.py b/setup.py
@@ -17,7 +17,8 @@
 import sys
 import warnings
 
-import pkg_resources
+# import pkg_resources
+from packaging import version
 from setuptools import find_packages, setup
 
 import versioneer
@@ -40,7 +41,8 @@
 
     BUILD_CUDA = FORCE_CUDA or (torch.cuda.is_available() and (CUDA_HOME is not None))
 
-    _pt_version = pkg_resources.parse_version(torch.__version__).release
+    # _pt_version = pkg_resources.parse_version(torch.__version__).release
+    _pt_version = version.parse(torch.__version__).release
     if _pt_version is None or len(_pt_version) < 3:
         raise AssertionError("unknown torch version")
     TORCH_VERSION = int(_pt_version[0]) * 10000 + int(_pt_version[1]) * 100 + int(_pt_version[2])
