Skip to content

Johnfreeman/merge latest patch release - #38

Merged
jcfreeman2 merged 4 commits into
developfrom
johnfreeman/merge_latest_patch_release
Jul 17, 2026
Merged

Johnfreeman/merge latest patch release#38
jcfreeman2 merged 4 commits into
developfrom
johnfreeman/merge_latest_patch_release

Conversation

@jcfreeman2

@jcfreeman2 jcfreeman2 commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Description

This is a de-facto merge of the code from fddaq-v5.6.2 into develop; the johnfreeman/merge_latest_patch_release branch was forked from develop and then had patch/fddaq-v5.6.x merged into it.

As you can see from the lines which are changed, approving this can be done with a simple eye test.

Type of change

  • Documentation (non-breaking change that adds or improves the documentation)
  • New feature or enhancement (non-breaking change which adds functionality)
  • Optimization (non-breaking change that improves code/performance)
  • Bug fix (non-breaking change which fixes an issue)
  • Breaking change (whatever its nature)

Testing checklist

  • Unit tests pass (e.g. dbt-build --unittest)
  • Minimal system quicktest passes (pytest -s minimal_system_quick_test.py)
  • Full set of integration tests pass (dunedaq_integtest_bundle.sh)
  • Python tests pass if applicable (e.g. python -m pytest)
  • Pre-commit hooks run successfully if applicable (e.g. pre-commit run --all-files)

Comments here on the testing

Further checks

  • Code is commented where needed, particularly in hard-to-understand areas
  • Code style is correct (dbt-build --lint, and/or see https://dune-daq-sw.readthedocs.io/en/latest/packages/styleguide/)
  • If applicable, new tests have been added or an issue has been opened to tackle that in the future.
    (Indicate issue here: # (issue))

Kurt Biery and others added 4 commits July 14, 2026 11:18
LB write returns iterator to the element
Cherry-picked the 'LB write returns iterator' changes from develop for a v5.6.x patch
@jcfreeman2
jcfreeman2 requested a review from andrewmogan July 16, 2026 21:12

@andrewmogan andrewmogan 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.

LGTM

@jcfreeman2
jcfreeman2 merged commit 78a61e1 into develop Jul 17, 2026
5 of 6 checks passed
@jcfreeman2
jcfreeman2 deleted the johnfreeman/merge_latest_patch_release branch July 17, 2026 14:02
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