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

hutch_python-1.23.2/.github/CODEOWNERS

@@ -0,0 +1,14 @@
+# default group
+* @pcdshub/python-reviewers
+
+# language-specific group(s)
+## PYTHON files
+*.py @pcdshub/python-reviewers
+*.pyi @pcdshub/python-reviewers
+*.pyc @pcdshub/python-reviewers
+*.pyw @pcdshub/python-reviewers
+*.pyx @pcdshub/python-reviewers
+*.pyd @pcdshub/python-reviewers
+
+# github folder holds administrative files
+.github/** @pcdshub/software-admin

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hutch-python
-Version: 1.23.0
+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.0 → hutch_python-1.23.2}/docs/source/releases.rst

@@ -2,6 +2,24 @@ Release History
 ###############
 
 
+v1.23.1 (2025-05-14)
+====================
+
+Bugfixes
+--------
+- Fixed pathcheck in hutch_python/epics_arch.py:create_softlink
+
+Maintenance
+-----------
+- Separate test_hist_file_arg into three separate test cases to hopefully alleviate test suite timeout issues
+
+Contributors
+------------
+- tangkong
+- vespos
+
+
+
 v1.23.0 (2025-04-07)
 ====================
 

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.0 → 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.0'
-__version_tuple__ = version_tuple = (1, 23, 0)
+__version__ = version = '1.23.2'
+__version_tuple__ = version_tuple = (1, 23, 2)
+
+__commit_id__ = commit_id = 'gb7059670d'

{hutch_python-1.23.0 → 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.0 → hutch_python-1.23.2}/hutch_python/epics_arch.py

@@ -310,7 +310,7 @@ def create_softlink(experiment, link_path):
     overwrites it with the new active experiment.
     """
     # Defaults new softlink in /cds/group/pcds/dist/pds/{}/misc/
-    if not os.path.exists(link_path):
+    if not os.path.exists(link_path.format(experiment[0:3])):
         raise OSError('Path does not exist path: %s' % link_path)
 
     subprocess.run(['ln', '-sf', link_path.format(experiment[0:3]) + 'epicsArch_'

{hutch_python-1.23.0 → hutch_python-1.23.2}/hutch_python/tests/test_cli.py

@@ -75,6 +75,7 @@ def test_create_arg():
     if test_dir.exists():
         shutil.rmtree(test_dir)
 
+    # Needs manual confirmation if we run with capture output on...
     with cli_args(['hutch_python', '--create', hutch]):
         with restore_logging():
             main()
@@ -96,11 +97,9 @@ def run_hpy_and_exit(*args: str) -> subprocess.CompletedProcess:
 
 
 @pytest.mark.timeout(30)
-def test_hist_file_arg(monkeypatch):
+def test_hist_file_arg():
     logger.debug("test_hist_file_arg")
     test_hist_file = (CFG_PATH.parent / "history.sqlite").resolve()
-    bad_hist_file = (CFG_PATH.parent / "aesefiudh" / "history.sqlite").resolve()
-    memory_hist_filename = ":memory:"
 
     # Test that the sqlite file gets made
     # First, need to remove the file if it already exists
@@ -113,17 +112,27 @@ def test_hist_file_arg(monkeypatch):
     assert test_hist_file.exists()
     # Remove the file for future tests
     test_hist_file.unlink()
-    # With the bad hist file we should still run ok with just a warning
-    run_hpy_and_exit("--hist-file", str(bad_hist_file))
     assert not test_hist_file.exists()
-    # Same with the in-memory choice
-    run_hpy_and_exit("--hist-file", memory_hist_filename)
+
+
+@pytest.mark.timeout(30)
+@pytest.mark.parametrize("filepath,", (
+    (CFG_PATH.parent / "aesefiudh" / "history.sqlite").resolve(),
+    ":memory:",
+))
+def test_no_hist_file(filepath):
+    # With the bad hist file or memory we should still run ok with just a warning
+    test_hist_file = (CFG_PATH.parent / "history.sqlite").resolve()
+    run_hpy_and_exit("--hist-file", str(filepath))
     assert not test_hist_file.exists()
 
+
+@pytest.mark.timeout(30)
+def test_template_file(monkeypatch):
     # Exercise the template + check default usage
     # We can't actually write to the default default in a test context
     # But we can check what the config would be
-    new_default = str(test_hist_file.parent / "${USER}-history.sqlite")
+    new_default = str(CFG_PATH.parent / "${USER}-history.sqlite")
     new_default_filled = Template(new_default).substitute({"USER": os.environ["USER"]})
     monkeypatch.setattr(
         hutch_python.cli,

{hutch_python-1.23.0 → 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.0
+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.0 → hutch_python-1.23.2}/hutch_python.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ dev-requirements.txt
 docs-requirements.txt
 pyproject.toml
 requirements.txt
+.github/CODEOWNERS
 .github/ISSUE_TEMPLATE.md
 .github/PULL_REQUEST_TEMPLATE.md
 .github/workflows/standard.yml
@@ -52,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