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

No dls bluesky #645

Merged
merged 12 commits into from
Nov 14, 2024
Merged

No dls bluesky #645

merged 12 commits into from
Nov 14, 2024

Conversation

DiamondJoseph
Copy link
Contributor

Fixes #643

Copy link

codecov bot commented Oct 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.28%. Comparing base (fff3ea7) to head (7063c1a).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #645      +/-   ##
==========================================
- Coverage   92.33%   92.28%   -0.06%     
==========================================
  Files          35       35              
  Lines        1800     1801       +1     
==========================================
  Hits         1662     1662              
- Misses        138      139       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@callumforrester callumforrester left a comment

Choose a reason for hiding this comment

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

Happy for merge once linting passes

@@ -204,8 +204,8 @@ def temp_yaml_config_file(
"env": {
"sources": [
{"kind": "dodal", "module": "dodal.adsim"},
{"kind": "planFunctions", "module": "dls_bluesky_core.plans"},
{"kind": "planFunctions", "module": "dls_bluesky_core.stubs"},
{"kind": "planFunctions", "module": "dodal.plans"},
Copy link
Contributor

Choose a reason for hiding this comment

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

I probably missed this in the last PR, but what happens if I just want to import some of the dodal plans, not all of them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In theory, not just for dodal.plans but for any plans module, you maintain a structure such that x.y.z is the plans you want imported, and x.y.a is plans that you don't want imported.
This is also why dodal.plan_stubs.wrapped on the line below.

Until we can tackle #681

@DiamondJoseph DiamondJoseph merged commit 0470253 into main Nov 14, 2024
28 checks passed
@DiamondJoseph DiamondJoseph deleted the no-dls-bluesky branch November 14, 2024 16:33
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.

dodal.common.MsgGenerator and dls_bluesky_core.core.MsgGenerator not equal
2 participants