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

Move plans and stubs from BlueAPI repository #3

Merged
merged 8 commits into from
Sep 7, 2023
Merged

Conversation

DiamondJoseph
Copy link
Contributor

  • Make packages for plans, stubs, tasks with doc strings
  • History preserved

callumforrester and others added 7 commits August 24, 2023 16:21
* Workaround scanspec serialization issue wtih non-string axes
* Add scan shape to metadata

* Fix formatting
* Fix typos in comments/logging

* Rename send_and_recieve method to send_and_receive
…an_nd implementation (#294)

- Remove fields of metadata duplicated by scan_nd (detectors) 
- Override incorrect values of metadata set by scan_nd (plan_name,
plan_args)
- Provide metadata that is available to our implementation but not
necessarily for scan_nd (shape)
- Rename metadata kwarg to match with Bluesky plans
@DiamondJoseph DiamondJoseph force-pushed the merge_plans branch 2 times, most recently from a2b48de to 805de2d Compare August 25, 2023 07:32
src/dls_bluesky_core/plans/scanspec.py Show resolved Hide resolved
src/dls_bluesky_core/plans/__init__.py Outdated Show resolved Hide resolved
src/dls_bluesky_core/plans/__init__.py Outdated Show resolved Hide resolved

Plans must adhere to BlueAPI's requirements:
- All arguments type hinted
- Metadata dict named 'metadata'
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we definitely want this as a hard requirement? If so, there should be some clever test to make sure it's followed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tests for the easily automated requirements added

src/dls_bluesky_core/plans/__init__.py Outdated Show resolved Hide resolved
src/dls_bluesky_core/tasks/__init__.py Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Sep 4, 2023

Codecov Report

❗ No coverage uploaded for pull request base (main@ce24de5). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 703d2a4 differs from pull request most recent head 2cb5e9b. Consider uploading reports for the commit 2cb5e9b to get more accurate results

@@           Coverage Diff           @@
##             main       #3   +/-   ##
=======================================
  Coverage        ?   87.01%           
=======================================
  Files           ?        9           
  Lines           ?       77           
  Branches        ?        0           
=======================================
  Hits            ?       67           
  Misses          ?       10           
  Partials        ?        0           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@DiamondJoseph DiamondJoseph force-pushed the merge_plans branch 3 times, most recently from 3811de9 to 66c7424 Compare September 6, 2023 11:01
- Enforce mypy on untyped functions
- Add documentation to packages explaining the functionality and requirements of plans, stubs
- Use __export__ to explicitly export "standalone" stubs
- Add tests to check compliance of plans, stubs to requirements
- Ensure loop for 3.10 Future
@DiamondJoseph DiamondJoseph merged commit 512edd2 into main Sep 7, 2023
@DiamondJoseph DiamondJoseph deleted the merge_plans branch September 7, 2023 09:28
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.

4 participants