DevNotes_12Jun2026_Technical

New Topics to Discuss

• Rebase vs. Merge
  • We need to define a process for this.
  • Allow force-pushes? We can turn them off for any/all branches
  • Discuss pros/cons of each method
    • Merge:
      • Pro: More easily integrate one branch into another; All commits retain original hash
      • 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
• Rulesets vs. Branch Protections
  • Ruleset for sasview and sasdata: release[-_][0-9.vV]* restricted, release[-_][0-9.vV]*[-_]* not restricted

Refactor Hackathon Recap

• Refactor Hackathon II: June 3-5
• Wiki Page
• Work Package Progress:
  • SasData:
    • Data loaders (ensure all are working and add as-needed)
    • Data Trends (finalize) - Miguel Gonzalez
    • Slicing backend - Jeff Krzywon
    • SasData refactor API: https://github.com/SasView/sasdata/pull/213 - Ready for review!
  • SasModels:
    • SasData integration (remove built-in data objects)

6.2.0

• Code freeze: Alpha 3 is out
• Outstanding Issues:
  • https://github.com/SasView/sasview/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22SasView%206.2.0%22
• Related to an ADR discussion, but what can come after the code freeze?
  • No
    • Bug fixes for features not introduced in v6.2.0
    • Models in sasmodels
    • Documentation not for new features
  • 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

Pull Requests to Discuss

• SasView
• SasModels
• SasData

Status updates of ongoing projects

• CodeScene and Ruff (Paul S./Jeff)
  • CodeScene integration - Minimal Safety Net complete
    • Enabling on sasdata - Wait until after 6.2.0 release
    • Merge the PR before Sept. Hackathon to allow developers to test prior to Nov. Contributor Camp

ADRs

• To finalize:
  • 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
    • Convert https://github.com/SasView/sasview/wiki/contribution_acknowledgments to an ADR - Paul B. to convert prior to the Nov. Contributor Camp

AOB?