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

hutch_python-1.23.1/.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.22.0 → hutch_python-1.23.1}/.github/workflows/standard.yml

@@ -18,10 +18,10 @@ jobs:
       # Extras that will be installed for both conda/pip:
       testing-extras: ""
       # Extras to be installed only for conda-based testing:
-      conda-testing-extras: "ipython=8.4.0"
+      conda-testing-extras: ""
       # Extras to be installed only for pip-based testing:
       # Set numpy<2 for now, remove when xraylib updates
-      pip-testing-extras: "ipython==8.4.0 numpy<2"
+      pip-testing-extras: ""
       # System packages to be installed only for conda-based testing:
       conda-system-packages: ""
       # System packages to be installed only for pip-based testing:

{hutch_python-1.22.0 → hutch_python-1.23.1}/.pre-commit-config.yaml

@@ -7,7 +7,7 @@ exclude: |
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
     -   id: no-commit-to-branch
     -   id: trailing-whitespace
@@ -27,11 +27,11 @@ repos:
     -   id: debug-statements
 
 -   repo: https://github.com/pycqa/flake8.git
-    rev: 6.0.0
+    rev: 7.2.0
     hooks:
     -   id: flake8
 
 -   repo: https://github.com/timothycrosley/isort
-    rev: 5.12.0
+    rev: 6.0.1
     hooks:
     -   id: isort

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hutch-python
-Version: 1.22.0
+Version: 1.23.1
 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
@@ -55,14 +55,14 @@ Requires-Dist: bluesky>=1.8.0
 Requires-Dist: coloredlogs>=15.0.0
 Requires-Dist: cookiecutter>=1.7.0
 Requires-Dist: happi>=1.9.0
-Requires-Dist: ipython>=7.26.0
+Requires-Dist: ipython<9.0.0
 Requires-Dist: jinja2>=2.11.0
 Requires-Dist: lightpath>=1.0.1
 Requires-Dist: matplotlib>=3.4.0
 Requires-Dist: nabs>=1.5.0
 Requires-Dist: pcdscalc>=0.6.0
 Requires-Dist: pcdsdaq>=2.3.0
-Requires-Dist: pcdsdevices>=7.0.0
+Requires-Dist: pcdsdevices>8.7.0
 Requires-Dist: pcdsutils>=0.5.0
 Requires-Dist: psdaq-control-minimal
 Requires-Dist: pyfiglet>=0.8.0
@@ -83,7 +83,7 @@ Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Requires-Dist: sphinxcontrib-jquery; extra == "doc"
 Requires-Dist: pypandoc; extra == "doc"
-Requires-Dist: numpy<2; extra == "doc"
+Dynamic: license-file
 
 ============
 Hutch Python

{hutch_python-1.22.0 → hutch_python-1.23.1}/conda-recipe/meta.yaml

@@ -27,14 +27,14 @@ requirements:
   - cookiecutter >=1.7.0
   - elog >=1.1.0
   - happi >=1.9.0
-  - ipython >=7.26.0
+  - ipython <9.0.0
   - jinja2 >=2.11.0
   - lightpath >=1.0.1
   - matplotlib-base >=3.4.0
   - nabs >=1.5.0
   - pcdscalc >=0.6.0
   - pcdsdaq >=2.3.0
-  - pcdsdevices >=7.0.0
+  - pcdsdevices >8.7.0
   - pcdsutils >=0.6.0
   - psdaq-control-minimal >=3.3.19
   - psdm_qs_cli >=0.3.1

{hutch_python-1.22.0 → hutch_python-1.23.1}/docs/source/releases.rst

@@ -2,6 +2,46 @@ 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)
+====================
+
+Features
+--------
+- Added ability to load additional devices not on the current beamline or hutch/area using happi search.
+
+Bugfixes
+--------
+- update functions anticipating py3.12 and IPython > 8.26
+
+Maintenance
+-----------
+- Enable the deferral of preset loading to avoid a pre-mature performance hit
+
+Contributors
+------------
+- janeliu-slac
+- tangkong
+
+
+
 v1.22.0 (2024-12-19)
 ====================
 

{hutch_python-1.22.0 → hutch_python-1.23.1}/docs/source/yaml_files.rst

@@ -163,21 +163,53 @@ secondary elog.
 
 exclude_devices
 ------------
-The ``exclude_devices`` key is optional. ``exclude_devices`` expects a list
-of strings containing names of upstream devices that should not be loaded.
-It reduces the amount of unnecessary information shown in the console at
-load time. The list can be created as a multi-line array of strings or all
-on one line using the following formats:
+The ``exclude_devices`` key is optional. ``exclude_devices`` expects a string
+that starts with a "-" symbol on each line. The string is the name of a device
+that should not be loaded.
+
+This feature reduces the amount of unnecessary information shown in the console
+at load time. The list uses the following format:
 
 .. code-block:: YAML
 
    exclude_devices:
       - crix_cryo_y
       - at2k2_calc
+      - tmo_lamp_sqr1
+
+
+additional_devices
+------------
+The ``additional_devices`` key is optional. This key allows hutch-python to
+load additional devices that are on a different beamline or in a different
+hutch/area. The first entry below ``additional_devices`` is a search name,
+such as 'tmo_sqr1_search'. Search names are arbitrarily determined by the user
+but should start with a letter or number. Each search name is followed by a
+happi search key, such as "beamline" and a value. For example, "beamline: TMO".
+This tells hutch-python to gather all devices on the TMO beamline and load
+them. A second search criterion can be added below "beamline: TMO" to constrain
+the search further, so that only those devices that fit both search criteria
+will be loaded. For example, adding "device_class: pcdsdevices.sqr1.SQR1" below
+"beamline: TMO" tells hutch-python to load devices from the TMO beamline whose
+"device_class" key has a value of "pcdsdevices.sqr1.SQR1". More lines can be
+added to obtain even more specific search results.
+
+A search value can contain a wildcard symbol (*). For example, "name: tmo_*".
+
+In the example below hutch-python will load all devices from "tmo_sqr1_search",
+"las_search", and "crix_search".
 
 .. code-block:: YAML
 
-   exclude_devices: ['crix_cryo_y', 'at2k2_calc']
+   additional_devices:
+      tmo_sqr1_search:
+         beamline: TMO
+         device_class: pcdsdevices.sqr1.SQR1
+         z: -1, 1
+      las_search:
+        name: LAS
+      crix_search:
+         name: crix_*
 
 
 Full File Example

{hutch_python-1.22.0 → hutch_python-1.23.1}/docs-requirements.txt

@@ -4,5 +4,3 @@ sphinx
 sphinx_rtd_theme
 sphinxcontrib-jquery
 pypandoc
-# Temporary pin, xraylib 4.1.3 (pcdscalc) incompatible
-numpy <2

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

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.22.0'
-__version_tuple__ = version_tuple = (1, 22, 0)
+__version__ = version = '1.23.1'
+__version_tuple__ = version_tuple = (1, 23, 1)

{hutch_python-1.22.0 → hutch_python-1.23.1}/hutch_python/constants.py

@@ -39,7 +39,8 @@ VALID_KEYS = (
     'daq_host',
     'obj_config',
     'session_timer',
-    'exclude_devices'
+    'exclude_devices',
+    'additional_devices'
 )
 NO_LOG_EXCEPTIONS = (KeyboardInterrupt, SystemExit)
 LOG_DOMAINS = {".pcdsn", ".slac.stanford.edu"}

{hutch_python-1.22.0 → hutch_python-1.23.1}/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.22.0 → hutch_python-1.23.1}/hutch_python/happi.py

@@ -1,9 +1,11 @@
 import enum
 import inspect
 import logging
+from typing import Dict, List, Optional
 
 import happi
 import ophyd
+from happi.cli import search_parser
 from happi.loader import load_devices
 
 try:
@@ -30,7 +32,8 @@ def get_happi_objs(
     light_ctrl: LightController,
     endstation: str,
     load_level: DeviceLoadLevel = DeviceLoadLevel.STANDARD,
-    exclude_devices: list[str] = None
+    exclude_devices: Optional[List[str]] = None,
+    additional_devices: Optional[Dict[str, Dict[str, str]]] = None
 ) -> dict[str, ophyd.Device]:
     """
     Get the relevant items for ``endstation`` from the happi database ``db``.
@@ -53,16 +56,30 @@ def get_happi_objs(
     endstation: ``str``
         Name of hutch
 
+    load_level: ``DeviceLoadLevel``
+        load all or standard devices
+
+    exclude_devices: ``Optional[List[str]]``
+        an optional list of devices that should be excluded when loading
+
+    additional_devices: ``Optional[Dict[str, Dict[str, str]]]``
+        an optional dictionary of dictionaries with happi search terms
+        whose results are loaded
+
     Returns
     -------
     objs: ``dict``
         A mapping from item name to item
     """
 
-    # Explicitly set exclude_devices to empty list to avoid mutable default arguments issue.
+    # Explicitly set exclude_devices and additional_devices to empty
+    # containers to avoid mutable default arguments issue.
     if not exclude_devices:
         exclude_devices = []
 
+    if not additional_devices:
+        additional_devices = {}
+
     # Load the happi Client
     if None not in (light_ctrl, lightpath):
         client = light_ctrl.client
@@ -113,6 +130,28 @@ def get_happi_objs(
         logger.warning(f'{len(containers)} active devices found for '
                        'this beampath')
 
+    # Load additional devices
+    for search_val in additional_devices.values():
+
+        search_list = []
+        final_results = []
+
+        for entry_key, entry_val in search_val.items():
+            search_string = entry_key + '=' + entry_val
+            search_list.append(search_string)
+
+        search_results = search_parser(
+            client=client,
+            use_glob=True,
+            search_criteria=search_list
+        )
+        search_results = list(search_results)
+        final_results += search_results
+        final_results = list(set(final_results))
+
+        containers.extend(
+            res.item for res in final_results if res.item not in containers)
+
     # Do not load excluded devices
     for device in containers.copy():
         if device.name in exclude_devices:

{hutch_python-1.22.0 → hutch_python-1.23.1}/hutch_python/ipython_session_timer.py

@@ -58,11 +58,11 @@ class IPythonSessionTimer:
         ipython.events.register('pre_run_cell', self._set_user_active)
         ipython.events.register('post_run_cell', self._set_user_inactive)
 
-    def _set_user_active(self):
+    def _set_user_active(self, *args, **kwargs):
         self.user_active = True
         self.last_active_time = time.monotonic()
 
-    def _set_user_inactive(self):
+    def _set_user_inactive(self, *args, **kwargs):
         self.user_active = False
         self.last_active_time = time.monotonic()
 

{hutch_python-1.22.0 → hutch_python-1.23.1}/hutch_python/load_conf.py

@@ -305,11 +305,24 @@ def load_conf(conf, hutch_dir=None, args=None):
                 'Invalid exclude_devices conf, must be a list.')
             exclude_devices = []
         else:
-            exclude_devices = [device_name.strip() for device_name in exclude_devices]
+            exclude_devices = [device_name.strip()
+                               for device_name in exclude_devices]
     except KeyError:
         exclude_devices = []
         logger.info(
-            'Missing exclude_devices in conf. Will load all devices.')
+            'Exclude_devices has not been set in conf. Will load all devices.')
+
+    try:
+        # These are the additional devices to load
+        additional_devices = conf['additional_devices']
+        for search_val in additional_devices.values():
+            if not isinstance(search_val, dict):
+                logger.error(
+                    'Invalid additional_devices conf, must be a dictionary of dictionaries.')
+    except KeyError:
+        additional_devices = {}
+        logger.info(
+            'Additional_devices has not been set in conf. No additional devices will be loaded.')
 
     # Set the session timeout duration
     try:
@@ -318,7 +331,7 @@ def load_conf(conf, hutch_dir=None, args=None):
     except KeyError:
         hutch_python.ipython_session_timer.configure_timeout(172800)
         logger.info(
-            'Missing session_timer value from conf. Set default value to 172800 seconds (48 hours).')
+            'Missing session_timer value from conf. Session will time out in 48 hours.')
 
     # Make cache namespace
     cache = LoadCache((hutch or 'hutch') + '.db', hutch_dir=hutch_dir)
@@ -475,7 +488,7 @@ def load_conf(conf, hutch_dir=None, args=None):
 
             # Gather relevant objects given the BeamPath
             happi_objs = get_happi_objs(
-                db, lc, hutch, load_level=load_level, exclude_devices=exclude_devices)
+                db, lc, hutch, load_level=load_level, exclude_devices=exclude_devices, additional_devices=additional_devices)
             cache(**happi_objs)
 
             # create and store beampath
@@ -583,10 +596,12 @@ def load_conf(conf, hutch_dir=None, args=None):
                     path.mkdir()
                     path.chmod(0o777)
             if experiment is None:
-                setup_preset_paths(hutch=beamline_presets)
+                setup_preset_paths(hutch=beamline_presets,
+                                   defer_loading=True)
             else:
                 setup_preset_paths(hutch=beamline_presets,
-                                   exp=experiment_presets)
+                                   exp=experiment_presets,
+                                   defer_loading=True)
 
     # configure objects
     if obj_config is not None:

{hutch_python-1.22.0 → hutch_python-1.23.1}/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,
@@ -160,7 +169,8 @@ def test_ipython_tab_completion():
     # us.
     hutch_python.cli.configure_ipython_session(HutchPythonArgs())
 
-    completer = IPython.core.completer.Completer(namespace=ns)
+    completer = IPython.core.completer.IPCompleter(namespace=ns)
     completer.limit_to__all__ = False
+    completer.line_buffer = "a."
     assert 'a.THIS_SHOULD_NOT_BE_THERE' not in completer.attr_matches('a.')
     assert completer.attr_matches('a.') == ['a.foobar']

{hutch_python-1.22.0 → hutch_python-1.23.1}/hutch_python/tests/test_happi.py

@@ -78,9 +78,70 @@ def test_happi_objs_with_exclude_devices():
     assert len(objs) == 4
 
     # Call get_happi_objs() with exclude_devices
-    objs_exclude_devices = get_happi_objs(db, lc, 'tst', DeviceLoadLevel.STANDARD, exclude_devices)
+    objs_exclude_devices = get_happi_objs(
+        db, lc, 'tst', DeviceLoadLevel.STANDARD, exclude_devices=exclude_devices)
     assert len(objs_exclude_devices) == 2
 
     # Check that none of the loaded devices are in the exclude_devices list
     for obj in objs_exclude_devices:
         assert obj not in exclude_devices
+
+
+# Test ability to add additional devices using multiple happi search criteria
+@conftest.requires_lightpath
+def test_happi_objs_with_additional_devices_using_multiple_search_criteria():
+    # Check if the user can load additional devices generated by happi's
+    # search_parser() function. This test checks for cases where multiple
+    # search criteria are passed to search_parser(). For comparison,
+    # get_happi_objs() is first called without the 'additional_devices'
+    # variable and then called again with 'additional_devices'.
+
+    additional_devices = {
+        'beamline_test': {'beamline': 'ZZZ'},
+        'tst_device_3_test': {'name': 'tst_device_3'}
+    }
+
+    logger.debug("test_happi_objs")
+    db = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                      'happi_db.json')
+    # Only select active objects
+    lc = get_lightpath(db, 'tst')
+
+    # Call get_happi_objs() without additional_devices
+    objs = get_happi_objs(db, lc, 'tst', DeviceLoadLevel.STANDARD)
+    assert len(objs) == 4
+
+    # Call get_happi_objs() with additional_devices
+    objs_additional_devices = get_happi_objs(
+        db, lc, 'tst', DeviceLoadLevel.STANDARD, additional_devices=additional_devices)
+
+    # Check that the loaded devices include additional_devices
+    assert len(objs_additional_devices) == 6
+
+
+# Test ability to add additional devices using happi search with globs
+@conftest.requires_lightpath
+def test_happi_objs_with_additional_devices_using_globs():
+    # This test checks for cases where a search criterion with globs is passed
+    # to happi's search_parser(). For comparison, get_happi_objs() is first
+    # called without the 'additional_devices' variable and then called again
+    # with 'additional_devices'.
+
+    additional_devices = {'globs_test': {'name': 'tst_device_*'}}
+
+    logger.debug("test_happi_objs")
+    db = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                      'happi_db.json')
+    # Only select active objects
+    lc = get_lightpath(db, 'tst')
+
+    # Call get_happi_objs() without additional_devices
+    objs = get_happi_objs(db, lc, 'tst', DeviceLoadLevel.STANDARD)
+    assert len(objs) == 4
+
+    # Call get_happi_objs() with additional_devices
+    objs_additional_devices = get_happi_objs(
+        db, lc, 'tst', DeviceLoadLevel.STANDARD, additional_devices=additional_devices)
+
+    # Check that the loaded devices include additional_devices
+    assert len(objs_additional_devices) == 6

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hutch-python
-Version: 1.22.0
+Version: 1.23.1
 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
@@ -55,14 +55,14 @@ Requires-Dist: bluesky>=1.8.0
 Requires-Dist: coloredlogs>=15.0.0
 Requires-Dist: cookiecutter>=1.7.0
 Requires-Dist: happi>=1.9.0
-Requires-Dist: ipython>=7.26.0
+Requires-Dist: ipython<9.0.0
 Requires-Dist: jinja2>=2.11.0
 Requires-Dist: lightpath>=1.0.1
 Requires-Dist: matplotlib>=3.4.0
 Requires-Dist: nabs>=1.5.0
 Requires-Dist: pcdscalc>=0.6.0
 Requires-Dist: pcdsdaq>=2.3.0
-Requires-Dist: pcdsdevices>=7.0.0
+Requires-Dist: pcdsdevices>8.7.0
 Requires-Dist: pcdsutils>=0.5.0
 Requires-Dist: psdaq-control-minimal
 Requires-Dist: pyfiglet>=0.8.0
@@ -83,7 +83,7 @@ Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Requires-Dist: sphinxcontrib-jquery; extra == "doc"
 Requires-Dist: pypandoc; extra == "doc"
-Requires-Dist: numpy<2; extra == "doc"
+Dynamic: license-file
 
 ============
 Hutch Python

{hutch_python-1.22.0 → hutch_python-1.23.1}/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

{hutch_python-1.22.0 → hutch_python-1.23.1}/hutch_python.egg-info/requires.txt

@@ -3,14 +3,14 @@ bluesky>=1.8.0
 coloredlogs>=15.0.0
 cookiecutter>=1.7.0
 happi>=1.9.0
-ipython>=7.26.0
+ipython<9.0.0
 jinja2>=2.11.0
 lightpath>=1.0.1
 matplotlib>=3.4.0
 nabs>=1.5.0
 pcdscalc>=0.6.0
 pcdsdaq>=2.3.0
-pcdsdevices>=7.0.0
+pcdsdevices>8.7.0
 pcdsutils>=0.5.0
 psdaq-control-minimal
 pyfiglet>=0.8.0
@@ -27,7 +27,6 @@ sphinx
 sphinx_rtd_theme
 sphinxcontrib-jquery
 pypandoc
-numpy<2
 
 [test]
 lightpath

{hutch_python-1.22.0 → hutch_python-1.23.1}/requirements.txt

@@ -3,14 +3,14 @@ bluesky>=1.8.0
 coloredlogs>=15.0.0
 cookiecutter>=1.7.0
 happi>=1.9.0
-ipython>=7.26.0
+ipython<9.0.0
 jinja2>=2.11.0
 lightpath>=1.0.1
 matplotlib>=3.4.0
 nabs>=1.5.0
 pcdscalc>=0.6.0
 pcdsdaq>=2.3.0
-pcdsdevices>=7.0.0
+pcdsdevices>8.7.0
 pcdsutils>=0.5.0
 psdaq-control-minimal
 pyfiglet>=0.8.0