From eb6d3f93b8c3c679e895626a44554a6b98ba21e1 Mon Sep 17 00:00:00 2001 From: Victor Yu Date: Sun, 8 Feb 2026 20:54:50 -0600 Subject: [PATCH] Update deprecated pkg_resources to importlib.metadata --- pyzfs/run.py | 8 ++++---- pyzfs/zfs/main.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyzfs/run.py b/pyzfs/run.py index 8fa86c8..d172895 100644 --- a/pyzfs/run.py +++ b/pyzfs/run.py @@ -4,7 +4,7 @@ import numpy as np from mpi4py import MPI from pprint import pprint -import pkg_resources +from importlib.metadata import version from .common.misc import parse_sys_argv from .common.misc import parse_many_values from .zfs.main import ZFSCalculation @@ -49,12 +49,12 @@ def main(): if mpiroot: try: - version = pkg_resources.require("PyZFS")[0].version + version_str = version("pyzfs") except Exception: - version = "" + version_str = "" print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") - print("PyZFS code {}".format(version)) + print("PyZFS code {}".format(version_str)) print(datetime.now().strftime("%Y-%m-%d %H:%M:%S")) print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") diff --git a/pyzfs/zfs/main.py b/pyzfs/zfs/main.py index 55a0197..e2ec790 100644 --- a/pyzfs/zfs/main.py +++ b/pyzfs/zfs/main.py @@ -1,6 +1,6 @@ from time import time import numpy as np -import pkg_resources +from importlib.metadata import version import os import psutil from mpi4py import MPI @@ -246,13 +246,13 @@ def get_xml(self): """ try: - version = pkg_resources.require("PyZFS")[0].version + version_str = version("pyzfs") except Exception: - version = "" + version_str = "" root = etree.Element("root") etree.SubElement(root, "code").text = "PyZFS" - etree.SubElement(root, "version").text = version + etree.SubElement(root, "version").text = version_str etree.SubElement(root, "object").text = self.__class__.__name__ etree.SubElement(root, "DTensor", unit="MHz").text = np.array2string(self.D) etree.SubElement(root, "D", unit="MHz").text = "{:.2f}".format(self.Dvalue)