Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add caproto Zebra IOC #2

Merged
merged 59 commits into from
May 17, 2024
Merged

Add caproto Zebra IOC #2

merged 59 commits into from
May 17, 2024

Commits on Feb 13, 2024

  1. Add dependencies and update pre-commit config

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    d4eb5cd View commit details
    Browse the repository at this point in the history

  2. Create base classes and utility functions

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    517213c View commit details
    Browse the repository at this point in the history

  3. CI: run ci workflow on all pushes

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    bd46a1a View commit details
    Browse the repository at this point in the history

  4. CI: Exclude pypy tests

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    f393c63 View commit details
    Browse the repository at this point in the history

  5. TST: add ophyd-based test for Zebra Caproto IOC

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    cc80d49 View commit details
    Browse the repository at this point in the history

  6. Working ophyd tests

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    e320f28 View commit details
    Browse the repository at this point in the history

  7. More fixes for the tests

    @mrakitin
    mrakitin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    a61223f View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. TST: add a caproto IOC fixture to be able to start and test against i… 

    …t in CI
    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    ca99a7e View commit details
    Browse the repository at this point in the history

  2. CI: disable Win/OSX builds; more python versions to test with; pin se… 

    …tuptools to an older version; more verbose test output
    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    d2d25e2 View commit details
    Browse the repository at this point in the history

  3. TST: add broadcast address a smarter way

    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    e151089 View commit details
    Browse the repository at this point in the history

  4. CI: Do not run tests twice on a PR from the same repo's branch

    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    7a9944a View commit details
    Browse the repository at this point in the history

  5. TST: print caproto stdout and stderr

    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    d7ec78c View commit details
    Browse the repository at this point in the history

  6. Use base IOC/ophyd in CI tests

    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    09a08ca View commit details
    Browse the repository at this point in the history

  7. Add saving capabilities to the base IOC

    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    eb36115 View commit details
    Browse the repository at this point in the history

  8. Fixed saving capabilities

    @mrakitin
    mrakitin committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    d29d442 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Make it work on MacOS

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    42f073b View commit details
    Browse the repository at this point in the history

  2. Make it work with act 

    act -W .github/workflows/ci.yml -j checks --matrix python-version:3.11

NOTE: Python 3.12 build fails on a datetime/TZ issue.

| OpenBLAS WARNING - could not determine the L2 cache size on this system, assuming 256k
| ImportError while loading conftest '/Users/mrakitin/src/NSLS-II/SRX/srx-caproto-iocs/tests/conftest.py'.
| tests/conftest.py:13: in <module>
|     from srx_caproto_iocs.base import OphydDeviceWithCaprotoIOC
| /opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/site-packages/srx_caproto_iocs/base.py:11: in <module>
|     from caproto import ChannelType
| /opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/site-packages/caproto/__init__.py:2: in <module>
|     from ._utils import *
| /opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/site-packages/caproto/_utils.py:29: in <module>
|     from ._dbr import SubscriptionType
| /opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/site-packages/caproto/_dbr.py:17: in <module>
|     from ._constants import (EPICS2UNIX_EPOCH, EPICS_EPOCH, MAX_ENUM_STATES,
| /opt/hostedtoolcache/Python/3.12.2/x64/lib/python3.12/site-packages/caproto/_constants.py:11: in <module>
|     EPICS_EPOCH = datetime.datetime.utcfromtimestamp(EPICS2UNIX_EPOCH)
| E   DeprecationWarning: datetime.datetime.utcfromtimestamp() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.fromtimestamp(timestamp, datetime.UTC).
    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    d78df6f View commit details
    Browse the repository at this point in the history

  3. Working saving example of multiple frames with ophyd

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    f18d187 View commit details
    Browse the repository at this point in the history

  4. Add scikit-image to the dependencies

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    fbf17aa View commit details
    Browse the repository at this point in the history

  5. Add missing skimage dependency to pull the dataset

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    384c001 View commit details
    Browse the repository at this point in the history

  6. PKG: apply setuptools limitation better

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7dbbaca View commit details
    Browse the repository at this point in the history

  7. CI: configure PyPI uploading

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    8248509 View commit details
    Browse the repository at this point in the history

  8. Add convenience script to run act locally

    @mrakitin
    mrakitin committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    69d4306 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. add suid to filename formatter

    @hyperrealist
    hyperrealist committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    15bb697 View commit details
    Browse the repository at this point in the history

  2. fix bug where uid not generated if only suid is used in file_name

    @hyperrealist
    hyperrealist committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    a4e70d4 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. fix typo, make more readable

    @hyperrealist
    hyperrealist committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    1d3aae3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from hyperrealist/add-zebra-ioc 

    add `suid` to filename formatter
    @mrakitin
    mrakitin authored Feb 17, 2024
    Configuration menu
    Copy the full SHA
    f63e243 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. CNL: remove irrelevant comment and add a docstring to the `_get_curre… 

    …nt_dataset` method
    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    618cbb3 View commit details
    Browse the repository at this point in the history

  2. TST: add input arg for a number of frames to the testing script

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    1ac8b6f View commit details
    Browse the repository at this point in the history

  3. Make multiple files saving working correctly

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    34e291c View commit details
    Browse the repository at this point in the history

  4. Update the script for manual testing to report the resulting `:full_f… 

    …ile_path`
    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    a179b09 View commit details
    Browse the repository at this point in the history

  5. Update caproto startup and testing scripts

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    66df054 View commit details
    Browse the repository at this point in the history

  6. PKG: install dependencies if skimage via extra

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    08bcbf2 View commit details
    Browse the repository at this point in the history

  7. CI: upload testing results as artifacts

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    1c6d5be View commit details
    Browse the repository at this point in the history

  8. CI: fix uploading of artifacts

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    5be9909 View commit details
    Browse the repository at this point in the history

  9. CI: update artifact names

    @mrakitin
    mrakitin committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    41fca53 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. add test parameters to test hidden spaces in write dir

    @hyperrealist
    hyperrealist authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    e75be6c View commit details
    Browse the repository at this point in the history

  2. fix lint errors from e75be6c

    @hyperrealist
    hyperrealist committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    a33c735 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. WIP: test with string IOC

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    9724d19 View commit details
    Browse the repository at this point in the history

  2. STY: fix linting errors

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    dc98043 View commit details
    Browse the repository at this point in the history

  3. Parametrize the script to start different caproto IOCs

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    cfe47e2 View commit details
    Browse the repository at this point in the history

  4. TST: cainfo and caput tests for string caproto IOC

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    9f1f5c6 View commit details
    Browse the repository at this point in the history

  5. TST: fix the blocking issue in the tests

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    2d05e76 View commit details
    Browse the repository at this point in the history

  6. CI: install epics-base package from conda-forge (for caget, `capu… 

    …t`, `cainfo`, etc.)
    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    9c9f539 View commit details
    Browse the repository at this point in the history

  7. Minor tweaks and addressing review comments from PR#2

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    590e554 View commit details
    Browse the repository at this point in the history

  8. CI: use micromamba for the python env

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    ab77f7f View commit details
    Browse the repository at this point in the history

  9. Change write_dir and file_name PV types to CHAR and fix the relev… 

    …ant test
    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    def5ded View commit details
    Browse the repository at this point in the history

  10. Minor improvements

    @mrakitin
    mrakitin committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    ccca4d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. sanitize file path better 

    * replaces unsupport characters with underscores _
* github artifact upload does not support the special chars:
	- Double quote "
	- Colon :
	- Less than <
	- Greater than >
	- Vertical bar |
	- Asterisk *
	- Question mark ?
	- Carriage return \r
	- Line feed \n
* note that \r, \n are included in whitespace regex symbol \s
    @hyperrealist
    hyperrealist committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    7d0e104 View commit details
    Browse the repository at this point in the history

  2. update test_base_ophyd.py to use the correct path sanitizer

    @hyperrealist
    hyperrealist committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    571539e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from NSLS-II-SRX/more-caproto-ioc-flavors 

    String/Char caproto IOC with demo tests
    @hyperrealist
    hyperrealist authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    9abfa20 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Dev updates for the Zebra IOC

    @mrakitin
    mrakitin committed May 14, 2024
    Configuration menu
    Copy the full SHA
    af0f986 View commit details
    Browse the repository at this point in the history

  2. WIP: can save enc1 1-D data

    @mrakitin
    mrakitin committed May 14, 2024
    Configuration menu
    Copy the full SHA
    0afd370 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Vendor acquire/saver methods from the base IOC in the Zebra one

    @mrakitin
    mrakitin committed May 16, 2024
    Configuration menu
    Copy the full SHA
    6524861 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Prototyped IOC to accept the a dict of arrays to save - the ophyd/blu… 

    …esky side should do the logic and call the saver when done
    @mrakitin
    mrakitin authored and SRX Operator committed May 17, 2024
    Configuration menu
    Copy the full SHA
    adb96a3 View commit details
    Browse the repository at this point in the history

  2. Add support for SIS scaler exporting

    @mrakitin
    mrakitin authored and SRX Operator committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d7ea796 View commit details
    Browse the repository at this point in the history

  3. Fix enum default value for the dev_type

    @mrakitin
    mrakitin authored and SRX Operator committed May 17, 2024
    Configuration menu
    Copy the full SHA
    afdb488 View commit details
    Browse the repository at this point in the history

  4. Clean up irrelevant code

    @mrakitin
    mrakitin authored and SRX Operator committed May 17, 2024
    Configuration menu
    Copy the full SHA
    246d885 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11 from NSLS-II-SRX/add-zebra-ioc-dev 

    Dev/tests for Zebra Saver IOC
    @mrakitin
    mrakitin authored May 17, 2024
    Configuration menu
    Copy the full SHA
    9dc73ff View commit details
    Browse the repository at this point in the history