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.

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

Merge dev into main #28

Closed
wants to merge 35 commits into from
Closed

Merge dev into main #28

wants to merge 35 commits into from

Commits on Mar 30, 2023

  1. Configuration menu
    Copy the full SHA
    337812b View commit details
    Browse the repository at this point in the history
  2. Make the LABELS record the same order as PandA sent

    This does now mean we do a lot more re-ordering of the list,
    but the alternative is to keep two lists which would more easily
    become out of sync.
    AlexanderWells-diamond committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    1e25c54 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. Publish enums as lists of strings, not ints

    This applies to any PandA field that returns us a label field.
    Tests updated to accomodate this.
    AlexanderWells-diamond committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    cb19511 View commit details
    Browse the repository at this point in the history
  2. Add metadata to PVAccess for last column in table

    Also fixes some mypy errors in tests
    AlexanderWells-diamond committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    085453c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Add test for PVAccess

    Also upgrade to newest pythonSoftIoc which includes waveform of
    strings support.
    Also adjust typing of some test fixtures to better indicate that
    the order of items is important
    AlexanderWells-diamond committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0772b53 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Set record alarm when PandA disconnects

    Also raise exception if initial connect fails.
    AlexanderWells-diamond committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    db80d54 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e38323f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b342348 View commit details
    Browse the repository at this point in the history
  4. remove bobfile server

    tizayi authored and AlexanderWells-diamond committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    966274f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4606e56 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Fix bobfile tests by regenerating all the files

    Also improves the IOC startup, by waiting for a signal rather than
    just a flat sleep timer
    AlexanderWells-diamond committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    b4031fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d3a4f19 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. Configuration menu
    Copy the full SHA
    3deab0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c7499b9 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Configuration menu
    Copy the full SHA
    a8586b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Configuration menu
    Copy the full SHA
    ec9cc23 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge pull request PandABlocks#22 from evalott100/fix_failing_unit_test

    Changed test to use lower case names consistent with PVA
    evalott100 authored Aug 10, 2023
    Configuration menu
    Copy the full SHA
    61ff502 View commit details
    Browse the repository at this point in the history
  2. Changed create_softioc to take a client instead of a hostname, change…

    …d the name of DummyServer to MockedServer
    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    35dd00d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d14baff View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4b3ebef View commit details
    Browse the repository at this point in the history
  5. made flake8 compatible

    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    e1c4c2d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1550517 View commit details
    Browse the repository at this point in the history
  7. fixed a unit test

    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    0da76d9 View commit details
    Browse the repository at this point in the history
  8. Fixed linting

    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    045c2e5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b851fc7 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    b370cf3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f055f82 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    10f70ca View commit details
    Browse the repository at this point in the history
  13. Corrected the time update tests drvl, added sleep statements to tests…

    … retrieving commands from the to give them time
    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    70d15c6 View commit details
    Browse the repository at this point in the history
  14. Pinned pvi requirement to allow for bobfile consistency between 3.9 a…

    …nd 3.10/3.11. We should consider 3.10 minimum on pandablocks-ioc
    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    51bab11 View commit details
    Browse the repository at this point in the history
  15. added a BaseEventLoop to the mocked_time_record_updater since it will…

    … give a deprecation warning on python 3.10 if you don't
    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    a9139d8 View commit details
    Browse the repository at this point in the history
  16. Pinned setuptools version and added as a requirement (as well as an i…

    …nstall requires). Should hopefully fix the problem of deprecation warnings on python/3.8
    evalott100 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    f8fa658 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Changed tests which use the command_queue

    to use waits, changed the
    mocked_panda_standard_responses to wait
    until the MockedAsyncioClient is set up
    before proceeding with the test.
    evalott100 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    9c88dae View commit details
    Browse the repository at this point in the history
  2. Added a wait on test_bobfiles_created

    to allow bobfiles time to be written
    in the subprocess. Changed to pvi>=0.5
    and python>=3.10
    evalott100 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e289cb3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request PandABlocks#23 from evalott100/adjust_testing_envi…

    …ronment
    
    Adjust testing environment
    evalott100 authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e292130 View commit details
    Browse the repository at this point in the history