add the ophyd call for the merlin#22
Open
Jennefer Maldonado (jennmald) wants to merge 7 commits into
Open
Conversation
Jennefer Maldonado (jennmald)
requested review from
Dan Henriksen (dihenriksen) and
Thomas A Caswell (tacaswell)
Dan Henriksen (dihenriksen)
previously approved these changes
Mar 25, 2026
| ophyd-async = { version = ">=0.17a2, <0.17a3", extras = ["ca", "pva"] } | ||
| # TODO get this onto conda-forge | ||
| cditools = { git = "https://github.com/nsls2/cditools", rev="main" } | ||
| cditools = { git = "https://github.com/nsls2/cditools", branch="merlin-opyhd" } |
Contributor
There was a problem hiding this comment.
Suggested change
| cditools = { git = "https://github.com/nsls2/cditools", branch="merlin-opyhd" } | |
| cditools = { git = "https://github.com/nsls2/cditools", branch="merlin-ophyd" } |
Contributor
Author
There was a problem hiding this comment.
I made a typo and it is in fact called "opyhd"
Contributor
There was a problem hiding this comment.
I think it's the branch name I used in my suggestion (but I think it's temporary anyway):
https://github.com/NSLS2/cdi-profile-collection/tree/merlin-ophyd
Contributor
|
It would be good to sort out why the distribution build workflow fails: |
Contributor
Author
|
Max Rakitin (@mrakitin) I have another PR open where I was investigating this but got no where production. Take a look at #19 |
Jennefer Maldonado (jennmald)
requested review from
Dan Henriksen (dihenriksen) and
Max Rakitin (mrakitin)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.