Merge release_6.0.0 branch into main

SasView / sasview

Code for the SasView application.

BSD 3-Clause "New" or "Revised" License

47 stars 41 forks source link

Merge release_6.0.0 branch into main #2900

Closed krzywon closed 3 days ago

krzywon commented 2 weeks ago

Description

This brings main up-to-date with everything in the release_6.0.0 branch. All of this has been reviewed previously, but three files had merge conflicts and should be reviewed to be sure my resolution caught everything that was required.

/.github/workflows/ci.yml
/.github/workflows/nightly-build.yml
/build_tools/requirements.txt

lucas-wilkins commented 4 days ago

I guess we find out if the merge was good when we actually merge it!