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

nshtrainer/loggers/wandb.py

@@ -1,9 +1,10 @@
+import importlib.metadata
 import logging
 from typing import TYPE_CHECKING, Literal
 
 import nshconfig as C
-import pkg_resources
 from lightning.pytorch import Callback, LightningModule, Trainer
+from packaging import version
 from typing_extensions import override
 
 from ..callbacks import WandbWatchConfig
@@ -120,9 +121,8 @@ class WandbLoggerConfig(CallbackConfigBase, BaseLoggerConfig):
                 import wandb  # type: ignore
 
                 # The minimum version that supports the new backend is 0.17.5
-                if pkg_resources.parse_version(
-                    wandb.__version__
-                ) < pkg_resources.parse_version("0.17.5"):
+                wandb_version = version.parse(importlib.metadata.version("wandb"))
+                if wandb_version < version.parse("0.17.5"):
                     log.warning(
                         "The version of WandB installed does not support the `wandb-core` backend "
                         f"(expected version >= 0.17.5, found version {wandb.__version__}). "

nshtrainer/scripts/find_packages.py

@@ -40,7 +40,6 @@ def main():
 
     if args.exclude_std:
         std_libs = set(sys.stdlib_module_names)
-        std_libs.update({"pkg_resources"})
         all_imports = all_imports - std_libs
 
     for package in sorted(all_imports):

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.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 0.14.4
+Version: 0.15.1
 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.1.dist-info}/RECORD

@@ -47,7 +47,7 @@ nshtrainer/loggers/__init__.py,sha256=C_xk0A3_qKbNdTmzK85AgjRHFD3w-jPRS2ig-iPhfE
 nshtrainer/loggers/_base.py,sha256=xiZKEK0ALJkcqf4OpVNRY0QbZsamR_WR7x7m_68YHXQ,705
 nshtrainer/loggers/csv.py,sha256=D_lYyd94bZ8jAgnRo-ARtFgVcInaD9zktxtsUD9RWCI,1052
 nshtrainer/loggers/tensorboard.py,sha256=wL2amRSdP68zbslZvBeM0ZQBnjF3hIKsz-_lBbdomaM,2216
-nshtrainer/loggers/wandb.py,sha256=QteSPfaBWxQ-FuuaF6_rKxw8twJdg_6oHoTQlbqvrXk,5079
+nshtrainer/loggers/wandb.py,sha256=FPwbf618AYmuPzHdhd1ZFhJ8qDjwTUiSe7cm7g3KCyM,5112
 nshtrainer/lr_scheduler/__init__.py,sha256=uEvgaFAs-4s_bAEMaildy0GT6OvgpgOEKTuzqutESHE,736
 nshtrainer/lr_scheduler/_base.py,sha256=7xOIuxQ86YHbFWG5a3gX46emQj1WN_LaY4-i0Q1TDBg,3659
 nshtrainer/lr_scheduler/linear_warmup_cosine.py,sha256=mn6cyizyI_stkXtg6zxIEGF9btIxMRWigUHUTlUYCSw,5221
@@ -71,19 +71,19 @@ nshtrainer/nn/module_list.py,sha256=fb2u5Rqdjff8Pekyr9hkCPkBorQ-fldzzFAjsgWAm30,
 nshtrainer/nn/nonlinearity.py,sha256=owtU4kh4G98psD0axOJWVfBhm-OtJVgFM-TXSHmbNPU,3625
 nshtrainer/optimizer.py,sha256=kuJEA1pvB3y1FcsfhAoOJujVqEZqFHlmYO8GW6JeA1g,1527
 nshtrainer/runner.py,sha256=USAjrExHkN5oVNVunsoPnLxfQrEHSaa54S3RipOe544,3605
-nshtrainer/scripts/find_packages.py,sha256=FbdlfmAefttFSMfaT0A46a-oHLP_ioaQKihwBfBeWeA,1467
+nshtrainer/scripts/find_packages.py,sha256=ixYivZobumyyGsf2B9oYMLyLTRcBzY_vUv-u3bNW-hs,1424
 nshtrainer/trainer/__init__.py,sha256=P2rmr8oBVTHk-HJHYPcUwWqDEArMbPR4_rPpATbWK3E,40
 nshtrainer/trainer/_runtime_callback.py,sha256=sd2cUdRJG-UCdQr9ruZvEYpNGNF1t2W2fuxwwVlQD9E,4164
 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.1.dist-info/METADATA,sha256=glwnOrFiNjiz0Qf_7x1wU8s4XTd_Hx0F3qseDNONjyI,885
+nshtrainer-0.15.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nshtrainer-0.15.1.dist-info/RECORD,,