Skip to content

Merlin Integration - #6

Merged
Max Rakitin (mrakitin) merged 32 commits into
NSLS2:mainfrom
jennmald:merlin
Jul 31, 2025
Merged

Merlin Integration#6
Max Rakitin (mrakitin) merged 32 commits into
NSLS2:mainfrom
jennmald:merlin

Conversation

@jennmald

Copy link
Copy Markdown
Contributor

Based on hxntools Merlin Integration. Currently writes to mock-proposals directory.

@mrakitin

Copy link
Copy Markdown
Contributor

I suggest rebasing on main rather than merging main into this PR branch.

git checkout main
git pull --all
git checkout -
git rebase main
git push --force-with-lease

@mrakitin

Copy link
Copy Markdown
Contributor

Any luck with fixing the style issues?

@jennmald

Copy link
Copy Markdown
Contributor Author

Max Rakitin (@mrakitin) I am stuck in meetings for the rest of the day. I will try to get to this tomorrow.

@jennmald

Copy link
Copy Markdown
Contributor Author

Max Rakitin (@mrakitin) I am stuck in meetings for the rest of the day. I will try to get to this tomorrow.

More progress but need to wrap up, was busy with RENEW school with Dan Olds and summer sunday demos.

@codecov-commenter

Codecov Comments Bot (codecov-commenter) commented Jul 11, 2025

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 0% with 240 lines in your changes missing coverage. Please review.

Please upload report for BASE (main@738959d). Learn more about missing BASE report.

Files with missing lines Patch % Lines
src/cditools/trigger_mixins.py 0.00% 125 Missing ⚠️
src/cditools/merlin.py 0.00% 105 Missing ⚠️
src/cditools/utils.py 0.00% 10 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##             main       #6   +/-   ##
=======================================
  Coverage        ?   29.87%           
=======================================
  Files           ?        7           
  Lines           ?      579           
  Branches        ?        0           
=======================================
  Hits            ?      173           
  Misses          ?      406           
  Partials        ?        0           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jennmald

Copy link
Copy Markdown
Contributor Author

Max Rakitin (@mrakitin) done!

@mrakitin Max Rakitin (mrakitin) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks, Jennefer Maldonado (@jennmald)!
Comments/suggestions are below.

Comment thread src/cditools/utils.py Outdated
Comment thread src/cditools/trigger_mixins.py Outdated
Comment thread src/cditools/merlin.py Outdated
Comment thread src/cditools/merlin.py
Comment thread src/cditools/eiger.py Outdated
Comment thread pyrightconfig.json
Comment thread src/cditools/trigger_mixins.py
Comment thread src/cditools/utils.py Outdated

@mrakitin Max Rakitin (mrakitin) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just a small suggestion below. Otherwise, looks good!

Comment thread README.md Outdated
Co-authored-by: Max Rakitin <mrakitin@users.noreply.github.com>

@mrakitin Max Rakitin (mrakitin) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

CI failures are unrelated.

@mrakitin
Max Rakitin (mrakitin) merged commit 6783296 into NSLS2:main Jul 31, 2025
3 of 7 checks passed
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