nshtrainer 0.14.4__py3-none-any.whl → 0.15.0__py3-none-any.whl

nshtrainer/util/_environment_info.py

@@ -1,4 +1,5 @@
 import getpass
+import importlib.metadata
 import inspect
 import logging
 import os
@@ -12,6 +13,7 @@ from typing import TYPE_CHECKING, Any, cast
 import nshconfig as C
 import psutil
 import torch
+from packaging import version
 from typing_extensions import Self
 
 from .slurm import parse_slurm_node_list
@@ -398,23 +400,46 @@ class EnvironmentPackageConfig(C.Config):
 
     @classmethod
     def from_current_environment(cls):
-        # Add Python package information
         python_packages: dict[str, Self] = {}
         try:
-            import pkg_resources
-
-            for package in pkg_resources.working_set:
-                python_packages[package.key] = cls(
-                    name=package.project_name,
-                    version=package.version,
-                    path=Path(package.location) if package.location else None,
-                    summary=getattr(package, "summary", None),
-                    author=getattr(package, "author", None),
-                    license=getattr(package, "license", None),
-                    requires=[str(req) for req in package.requires()],
-                )
+            for dist in importlib.metadata.distributions():
+                try:
+                    # Get package metadata
+                    metadata = dist.metadata
+
+                    # Parse the version, stripping any local version identifier
+                    pkg_version = version.parse(dist.version)
+                    clean_version = (
+                        f"{pkg_version.major}.{pkg_version.minor}.{pkg_version.micro}"
+                    )
+
+                    # Get requirements
+                    requires = []
+                    for req in dist.requires or []:
+                        try:
+                            requires.append(str(req))
+                        except ValueError:
+                            # If there's an invalid requirement, we'll skip it
+                            log.warning(
+                                f"Skipping invalid requirement for {dist.name}: {req}"
+                            )
+
+                    python_packages[dist.name] = cls(
+                        name=dist.name,
+                        version=clean_version,
+                        path=Path(str(f)) if (f := dist.locate_file("")) else None,
+                        summary=metadata["Summary"] if "Summary" in metadata else None,
+                        author=metadata["Author"] if "Summary" in metadata else None,
+                        license=metadata["License"] if "Summary" in metadata else None,
+                        requires=requires,
+                    )
+                except Exception as e:
+                    log.warning(f"Error processing package {dist.name}: {str(e)}")
+
         except ImportError:
-            log.warning("pkg_resources not available, skipping package information")
+            log.warning(
+                "importlib.metadata not available, skipping package information"
+            )
 
         return python_packages
 

{nshtrainer-0.14.4.dist-info → nshtrainer-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 0.14.4
+Version: 0.15.0
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com
@@ -16,6 +16,7 @@ Requires-Dist: nshconfig
 Requires-Dist: nshrunner
 Requires-Dist: nshutils
 Requires-Dist: numpy
+Requires-Dist: packaging
 Requires-Dist: psutil
 Requires-Dist: pytorch-lightning
 Requires-Dist: tensorboard ; extra == "extra"

{nshtrainer-0.14.4.dist-info → nshtrainer-0.15.0.dist-info}/RECORD

@@ -77,13 +77,13 @@ nshtrainer/trainer/_runtime_callback.py,sha256=sd2cUdRJG-UCdQr9ruZvEYpNGNF1t2W2f
 nshtrainer/trainer/checkpoint_connector.py,sha256=F2tkHogbMAa5U7335sm77sZBkjEDa5v46XbJCH9Mg6c,2167
 nshtrainer/trainer/signal_connector.py,sha256=2EzkVktlasl8PgWAKNLDZRUMY__gRlDy1HdinAU-tfU,10740
 nshtrainer/trainer/trainer.py,sha256=M97phnALfG18VxkMLoDr5AKFf4UaPBdc6S2BghdBtas,17103
-nshtrainer/util/_environment_info.py,sha256=yPtAbgjCY4tkvh5wp9sjNsF0Z45TYwzEAM_N2_b5BbY,23123
+nshtrainer/util/_environment_info.py,sha256=Nmhls6u5rtMWbeDLGCjEk58efUutc_ONSUg3fs59TSI,24210
 nshtrainer/util/_useful_types.py,sha256=dwZokFkIe7M5i2GR3nQ9A1lhGw06DMAFfH5atyquqSA,8000
 nshtrainer/util/environment.py,sha256=AeW_kLl-N70wmb6L_JLz1wRj0kA70xs6RCmc9iUqczE,4159
 nshtrainer/util/seed.py,sha256=Or2wMPsnQxfnZ2xfBiyMcHFIUt3tGTNeMMyOEanCkqs,280
 nshtrainer/util/slurm.py,sha256=rofIU26z3SdL79SF45tNez6juou1cyDLz07oXEZb9Hg,1566
 nshtrainer/util/typed.py,sha256=NGuDkDzFlc1fAoaXjOFZVbmj0mRFjsQi1E_hPa7Bn5U,128
 nshtrainer/util/typing_utils.py,sha256=8ptjSSLZxlmy4FY6lzzkoGoF5fGNClo8-B_c0XHQaNU,385
-nshtrainer-0.14.4.dist-info/METADATA,sha256=Xg7ON7o-nR8N-4C8E59k2jsvIaleKPDas5VpdTVyr6s,860
-nshtrainer-0.14.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nshtrainer-0.14.4.dist-info/RECORD,,
+nshtrainer-0.15.0.dist-info/METADATA,sha256=GWle2LcHPRsK2Ygf8jgf1eAUPa7eaAdiZT_NkVvauNw,885
+nshtrainer-0.15.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nshtrainer-0.15.0.dist-info/RECORD,,