Merged
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## staging #407 +/- ##
========================================
Coverage 95.09% 95.09%
========================================
Files 60 60
Lines 3792 3792
========================================
Hits 3606 3606
Misses 186 186 ☔ View full report in Codecov by Sentry. |
peterfpeterson
force-pushed
the
automerge_staging
branch
4 times, most recently
from
ee13596 to
24a0ef8
Compare
peterfpeterson
force-pushed
the
automerge_staging
branch
from
24a0ef8 to
402cb0f
Compare
walshmm
approved these changes
Jul 19, 2024
peterfpeterson
added a commit
that referenced
this pull request
Jul 19, 2024
walshmm
pushed a commit
that referenced
this pull request
Jul 29, 2024
walshmm
pushed a commit
that referenced
this pull request
Jul 30, 2024
`ReductionRecipe` code cleanup (#393) * Reduction recipe arguments This commit includes the following changes: * Add factory methods to `ReductionIngredients` to produce any required sub-recipe ingredients. This fix allows sub-recipes in `ReductionRecipe` to be called with their correct argument type. This behavior is now required by Pydantic v2, but in general should be considered correct behavior when typed arguments are used. * Remove temporary attributes from `ReductionRequest`. This includes removing the "ambiguous plural" for `focusGroup`, which is now simply `focusGroups: List[FocusGroup]`, and always will be accessed as a list. * Modify `SNAPRequest.payload: str` to `SNAPRequest.payload: Optional[Any]`. As such this now matches `SNAPResponse.data`. With respect to this change, note that previously the type of this argument was ignored, and `Request...` types were passed as the payload without stringification. Pydantic v2 will no longer allow this. * Remove the erroneous conversion of `runNumber` to `int` in `ReductionView`. Note that for compatibility with Mantid, `runNumber: str` is still the correct parameter type, as "ISIS" uses `str` suffixes to integer 'runNumber'. * Omit `runNumber` removal from the run-numbers list at the end of the reduction workflow. For the moment, it is desirable to retain the list of run numbers so that the user can easily see what has actually been reduced. Note that there actually was a defect associated with this removal operation, which has been bypassed by omitting this call. However, since the removal method works in other cases, any further work on this issue will be deferred to a later date. * fixup: ruff * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Kort Travis <traviska@ornl.gov> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> [pre-commit.ci] pre-commit autoupdate (#399) updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.0 → v0.5.1](astral-sh/ruff-pre-commit@v0.5.0...v0.5.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> make sure the finalCalibrationTable is set to the expected table (#406) Automerge staging into next (#407) Properly iterate diagnostics 🔂 (#412) * fix problem * add test of workflow implementer renaming on iteration * update workflow implementer test to use qtbot Retain reduction-workflow output workspaces As this commit itself is relatively small, and will be merged to "next" almost immediately, no attempt has been made to separate out the "staging" changes specific to the present defect. This commit includes changes added to facilitate `qtbot`-based testing, which also happen to satisfy the requirements of this "3.0.1 defect" regarding retention of reduction-workflow output workspaces: * Identify ADS-resident workspaces before the start of each workflow, and do not delete these workspaces at exit. This allows users to go back-and-forth between the SNAPRed panel, and the Mantid workbench, and not to have their workspaces unexpectedly deleted by SNAPRed. In addition, simply extending this workspace list where required allowed retention of final result workspaces from the reduction workflow. * Lock out other workflow tabs once a workflow has started; * Use `@Slot` decorator where appropriate, throughout the codebase. This allows `pyqt` to check `Signal` argument types, but in addition, it also allows clear identification of which methods are being employed as slots; * Add missing `QObject` derivation for several classes with methods that are used as Qt slots. * Add several new signals specifically to help during testing: these include a signal at the start of each workflow, and a signal when any `Worker` task completes. By default, connecting these `Signal` to `lambda *args: None` allows `qtbot` to intercept them when required; * All `QMessageBox` and `ActionPrompt`-style dialogs, including `SuccessPrompt` (formerly `SuccessDialog`) are now called only via static `warning`, `critical`, and `prompt` methods. This allows these dialogs to be easily mocked without requiring mocking their entire classes; * Remove 'WorkflowNodePresenter' as _dead_ code. This removal is in an _interim_ state, now marked by retaining the source file, but renamed to `WorkflowNodePresenter_.py`. The reason for this approach is that most probably we _do_ want to distinguish between `WorkflowPresenter` and `WorkflowNodePresenter`, and although it's not being used at present, this issue should probably be fixed. * Rename workspace-service plural methods to plural 'Workspaces'. Add 'excludeCache: bool' option to 'ListWorkspacesRequest'. [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci
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
2 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.
Description of work
Every time that there is a commit to
staging, that is merged directly intonext. This will ensure that bigfixes for the next release get into the development branch. The workflow is adapted from mantid.To test
Dev testing
The run that passed is here.
CIS testing
N/A
Link to EWM item
EWM6082