Repository navigation
Conversation
DCLM.set called forward_watcher_updates without importing it, so every beam-mode change raised NameError (both test_monochromator_beam_mode_switch cases failed). Assisted-by: copilot:claude-opus-4-8
The merge with main replaced a8feb5c's guard with an unconditional SuspendFloor, which would pause plans during MAINTENANCE/SHUTDOWN until the ring is above 390 mA. Restored main's version. Assisted-by: copilot:claude-opus-4-8
--doctest-modules imported src/hextools/gui/* in CI, where qtpy and bluesky-widgets are not installed: 13 collection errors on 3.11-3.13. Assisted-by: copilot:claude-opus-4-8
The shutters and rotation motor became optional keyword arguments after exposure_time; the tests still passed them positionally. Assisted-by: copilot:claude-opus-4-8
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
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.
Fixes for NSLS2#90, as a PR into this branch so they land in NSLS2#90 before it merges to
main. One commit per issue:dclm: importforward_watcher_updates—DCLM.setcalled it without importing it, so every white/mono beam-mode change (and the newchange_beam_modeplan) raisedNameError. Bothtest_monochromator_beam_mode_switchcases failed.mainreplaced the guard from a8feb5c with an unconditionalSuspendFloor(beam_current, 100, resume_thresh=390). That would pause plans during MAINTENANCE/SHUTDOWN until the ring is above 390 mA. Restoredmain's version unchanged.src/hextools/gui—--doctest-modulesimported the GUI modules in CI, whereqtpyandbluesky-widgetsaren't installed: 13 collection errors on Python 3.11–3.13.tomo_alignment_scanwith its new keyword arguments — the shutters and rotation motor became optional keyword arguments afterexposure_time, but the tests still passed them positionally.How this was verified
Mock tests only (ophyd-async mock devices; no simulated beamline, TST or real beamline). Same environment for both runs: hextools
py312pixi env,pytest -q, run the way CI runs it.main(0bc0fe2)The 13 remaining failures are the same tests that fail on
main(GeRM, Phantom,change_energy, tomography alignment, radiograph). The alignment tests now fail only onmain's existingValueError: True is not a valid ShutterStatus, not on the call signature. The suspender guard is in the profile, which pytest doesn't collect, so it has no automated test here.Not in this PR
RE_METADATA_KEYSis undefined ingui/__main__.py:195. It's insideQtRunEngineManagerMonitor, which nothing instantiates, so it doesn't crash; define it or drop the class.guiextra, and lint debt exists in files this PR doesn't touch.