Skip to content

Final 6.1.2 work to merge into main#3829

Merged
butlerpd merged 22 commits intomainfrom
main-6.1.2-merge
Jan 13, 2026
Merged

Final 6.1.2 work to merge into main#3829
butlerpd merged 22 commits intomainfrom
main-6.1.2-merge

Conversation

@krzywon
Copy link
Copy Markdown
Contributor

@krzywon krzywon commented Dec 17, 2025

Description

This PR brings main up-to-date with the 6.1.2 release branch. I branched off the release branch into this one, merged main into the branch and resolved the conflicts.

Review Checklist:

Documentation (check at least one)

  • There is nothing that needs documenting
  • Documentation changes are in this PR
  • There is an issue open for the documentation (link?)

Installers

  • There is a chance this will affect the installers, if so
    • Windows installer (GH artifact) has been tested (installed and worked)
    • MacOSX installer (GH artifact) has been tested (installed and worked)
    • Wheels installer (GH artifact) has been tested (installed and worked)

Licensing (untick if necessary)

  • The introduced changes comply with SasView license (BSD 3-Clause)

DrPaulSharp and others added 22 commits November 7, 2025 18:04
* Updates location of plugin models in docs

* Addresses review comments
… to account for changes in v6.x and how to launch the program from source
…els, all requirements match those for macos-13 from v6.1.1
…2-release

Release 6.1.2: MacOS Intel build using macos 15
@butlerpd butlerpd merged commit 0d8f81c into main Jan 13, 2026
48 checks passed
@butlerpd butlerpd deleted the main-6.1.2-merge branch January 13, 2026 14:39
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.

5 participants