hutch-python 1.23.1__tar.gz → 1.23.2__tar.gz

{hutch_python-1.23.1 → hutch_python-1.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hutch-python
-Version: 1.23.1
+Version: 1.23.2
 Summary: Launcher and Config Reader for LCLS Interactive IPython Sessions
 Author: SLAC National Accelerator Laboratory
 License: Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior

hutch_python-1.23.2/docs/source/upcoming_release_notes/403-mnt_dep_pkg_resources.rst

@@ -0,0 +1,22 @@
+403 mnt_dep_pkg_resources
+#########################
+
+API Changes
+-----------
+- N/A
+
+Features
+--------
+- N/A
+
+Bugfixes
+--------
+- N/A
+
+Maintenance
+-----------
+- replace deprecated pkg_resources.working_set with importlib.metadata.distributions
+
+Contributors
+------------
+- tangkong

{hutch_python-1.23.1 → hutch_python-1.23.2}/hutch_python/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.23.1'
-__version_tuple__ = version_tuple = (1, 23, 1)
+__version__ = version = '1.23.2'
+__version_tuple__ = version_tuple = (1, 23, 2)
+
+__commit_id__ = commit_id = 'gb7059670d'

{hutch_python-1.23.1 → hutch_python-1.23.2}/hutch_python/env_version.py

@@ -3,13 +3,12 @@ Utilities for getting relevant environment information.
 """
 from __future__ import annotations
 
+import importlib.metadata
 import logging
 import os
 import os.path
 import pkgutil
 
-import pkg_resources
-
 logger = logging.getLogger(__name__)
 
 _dev_ignore_list = ['ami', 'pdsapp']
@@ -42,10 +41,10 @@ def log_env() -> None:
 def dump_env() -> list[str]:
     """
     Get all packages and versions from the current environment.
-    conda list is slow, use pkg_resources instead
+    conda list is slow, use importlib.metadata.distributions instead
     this might miss dev overrides
     """
-    return sorted(str(pkg) for pkg in pkg_resources.working_set)
+    return sorted(str(dist.name) for dist in importlib.metadata.distributions())
 
 
 def get_conda_env_name() -> str:

{hutch_python-1.23.1 → hutch_python-1.23.2}/hutch_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hutch-python
-Version: 1.23.1
+Version: 1.23.2
 Summary: Launcher and Config Reader for LCLS Interactive IPython Sessions
 Author: SLAC National Accelerator Laboratory
 License: Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior

{hutch_python-1.23.1 → hutch_python-1.23.2}/hutch_python.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ docs/source/tutorial.ipynb
 docs/source/user_utils.rst
 docs/source/utils.rst
 docs/source/yaml_files.rst
+docs/source/upcoming_release_notes/403-mnt_dep_pkg_resources.rst
 docs/source/upcoming_release_notes/template-full.rst
 docs/source/upcoming_release_notes/template-short.rst
 hutch_python/__init__.py