Skip to content

Changes required for integration into tickit simulation framework#28

Merged
thomascobb merged 7 commits intomasterfrom
tickit-changes
Aug 16, 2021
Merged

Changes required for integration into tickit simulation framework#28
thomascobb merged 7 commits intomasterfrom
tickit-changes

Conversation

@thomascobb
Copy link
Contributor

@thomascobb thomascobb commented Aug 12, 2021

Make sure we use epicscorelibs libca in cothread

Move this as early as we can to avoid loading 2 versions of libca by mistake

Allow AsyncioDispatcher to take existing event loop

Need this if we want to embed IOC in existing asyncio app

Add ability to add arbitrary lines to Db file and test

Need this so we can read arbitrary db file, remove DTYP lines, add pythonSoftIOC records for logic of those records, then have it appear in the db file that is loaded in the IOC
See tests/sim_asyncio_ioc_override.py for an example of this

@codecov
Copy link

codecov bot commented Aug 12, 2021

Codecov Report

Merging #28 (b2cbcff) into master (2878076) will decrease coverage by 0.01%.
The diff coverage is 95.83%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #28      +/-   ##
==========================================
- Coverage   85.83%   85.81%   -0.02%     
==========================================
  Files          13       13              
  Lines         812      818       +6     
==========================================
+ Hits          697      702       +5     
- Misses        115      116       +1     
Impacted Files Coverage Δ
softioc/builder.py 95.69% <ø> (ø)
softioc/softioc.py 88.88% <94.11%> (-0.36%) ⬇️
softioc/__init__.py 92.30% <100.00%> (+0.64%) ⬆️
softioc/asyncio_dispatcher.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2878076...b2cbcff. Read the comment docs.

@thomascobb
Copy link
Contributor Author

@Araneidae Mac builds (apart from python 2.7) seem to be stuck in a queue somewhere on Github Actions, but I think they will work fine, so this is ready for review

Copy link
Collaborator

@Araneidae Araneidae left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realise I have no idea what this patch is doing, certainly no idea what "tickit" is... Not sure I can contribute very much

Copy link
Contributor Author

@thomascobb thomascobb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've commented on the lines I'd like reviewed

@thomascobb thomascobb merged commit a558b5a into master Aug 16, 2021
@thomascobb thomascobb deleted the tickit-changes branch August 16, 2021 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants