DevNotes_12Jun2026_Technical

New Topics to Discuss

• Branch maintenance
• Rebase vs. Merge
  • We need to define a process for this.
  • Different use-cases for each, so we shouldn't pigeon-hole ourselves
    • Can we define the use-cases where each is most appropriate?
  • Allow force-pushes? We can turn them off for any/all branches
    • Main/master and release branches seem an obvious place to disallow, but what about other branches?
    • There are times when this would be useful, so we shouldn't globally turn off
  • Does the affect every branch, are PRs treated differently, the number of commits may matter
  • Big commits are dangerous, so we need to ensure developers are making atomic commits
  • Rethink development?
    • Don't merge main until the feature branch is done.
    • Merge release branch into main more often? Automated process? Bot to pick changes from a release branch into main
  • Discuss pros/cons of each method (below are my initial thoughts)
    • Merge:
      • Pro: More easily integrate one branch into another; All commits retain original hash; Able to undo revert commits
      • Con: Added merge commit extends commit history; more difficult to rebase
    • Rebase:
      • Pro: Much cleaner commit history; All commits moved to the end of the rebased branch
      • Con: Changes made to the commit history; often requires a force-push; Difficult or impossible to revert
• Rulesets vs. Branch Protections
  • I modified the release branch rulesets for sasview and sasdata: release[-_][0-9.vV]* restricted, release[-_][0-9.vV]*[-_]* not restricted
  • Protects release_6.2.0, but does not protect release_6.2.0_bug_fix_x

Refactor Hackathon Recap

• Refactor Hackathon II: June 3-5
• Wiki Page
• Work Package Progress:
  • SasData:
    • Data Trends - https://github.com/SasView/sasdata/pull/216 - Ready for review!
    • Slicing backend
      • https://github.com/SasView/sasdata/pull/207 - Ready for review, using existing slicers!
      • https://github.com/SasView/sasdata/pull/197 - WIP using the meshes in the new slicer directory.
      • Which to use?
    • New angular strip slicer - https://github.com/SasView/sasdata/tree/strip-slicer - Needs unit tests before PR
    • Standard Error - https://github.com/SasView/sasdata/pull/215 - Ready for review!
    • SasData refactor API: https://github.com/SasView/sasdata/pull/213 - Ready for review!
  • SasView:
    • Undo stack - https://github.com/SasView/sasview/pull/3995 - Ready for review!

6.2.0

• Code freeze: Alpha 3 is out
• Outstanding Issues:
  • https://github.com/SasView/sasview/issues/3955 - Includes SasView, SasData, and SasModels issues
    • SasData: v0.12.0 tag already exists - What to do?
      • Current suggestion - Release as 0.12.1
    • SasModels: Any outstanding issues?
• Related to an ADR discussion, but what can come after the code freeze?
  • Within reason
    • Bug fixes for features added between v6.1.3 and v6.2.0
    • Documentation on new features
  • Always a yes
    • Release notes
    • Build/CI issues

Status updates of ongoing projects

• CodeScene and Ruff (Paul S./Jeff)
  • CodeScene integration - Minimal Safety Net complete
    • Enabling on sasdata - Merge into master now?

ADRs

• To finalize - Paul Sharp to send both out to the developers list for review:
  • https://github.com/orgs/SasView/discussions/3171#discussioncomment-15497631: Linter - to be proposed at next biweekly meeting
  • https://github.com/orgs/SasView/discussions/3475: Release automation - To be proposed at next biweekly meeting
    • Final write-up: https://github.com/orgs/SasView/discussions/3475#discussioncomment-16757778
    • Zenodo generation: build_tools/release_automation.py - Piotr to look into Zenodo DOI generation that he knows of in other repos
    • Pypi publishing: Work started in sasdata. Finalize and port to sasview and sasmodels - Piotr to work on - https://github.com/SasView/sasdata/blob/master/.github/workflows/test.yml#L84
    • Upload binaries to releases: Already working for nightly build. Port in progress - Draft PR
• Ongoing discussions:
  • https://github.com/orgs/SasView/discussions/3934: Defining the release process and release manager
    • Some of the process is outlined in https://github.com/SasView/sasview/wiki/DevNotes_DevGuide_ReleaseChecklistTemplate
    • Release notes for Dev releases? Cumulative from previous stable release or from last dev release? Final release should have cumulative.
    • Delete/pare-down/hide dev releases after stable release? As long as we keep the tags and the binaries, the release notes can be pared down. More work for release manager if pared down. Likely keep as is to not create more work for ourselves.
  • No Link: Contributing to SasView: Define the process, i.e. what the requestor needs to provide, level of support from the existing community, and what that gets the contributor
    • https://github.com/SasView/sasview/wiki/contribution_acknowledgments to an ADR - Paul B. to convert prior to the Nov. Contributor Camp

AOB?