Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 6.0.0 changes into main #3133

Merged
merged 225 commits into from
Jan 8, 2025
Merged

Merge 6.0.0 changes into main #3133

merged 225 commits into from
Jan 8, 2025

Conversation

krzywon
Copy link
Contributor

@krzywon krzywon commented Oct 24, 2024

Description

This is the last merge of the release_6.0.0 branch to go into main. All of the changes were previously approved, but there were merge conflicts in two files, ci.yml and DocViewWidget.py/

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)

Licencing (untick if necessary)

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

wpotrzebowski and others added 30 commits June 28, 2024 15:02
@wpotrzebowski
Update matrix.py
70f4687
@wpotrzebowski
Update requirements.txt
0623f5f
@tsole0
move pinned imports to version-pinned section and add comments in `re…
98b4f61 
…quirements.txt`
@tsole0
revert positions of imports back into non-pinned section as it seems …
bbab0c8 
…installers need to install some packages before others
@krzywon
Emit to the status bar when project loading begins and once it is com…
67c3b00 
…plete
@krzywon
Merge release_6.0.0 into release_6.0.0-macos13 and resolve conflict i…
11f4acc 
…n requirements.txt
@krzywon
Allow empty densities in the SLD calculator tool to better match the …
641bb2a 
…functionality of the online calculator
@krzywon
More robust prechecks for the SLD panel to prevent unhandled exceptions
e0a154f
@krzywon
Update SLD calculator help file to match latest behavior
64f0f34
@krzywon
Give user feedback if density is required
813242a
@krzywon
Merge branch 'release_6.0.0' into release_6.0.0-macos13
cbcfd33
@krzywon
Reset the x and y data transforms when creating new plots to prevent …
29dfdaa 
…new plots from getting the transforms of previous plots
@krzywon
INNO installer - do not default to the previously installed directory
c726315
@krzywon
INNO installer - warn the user if the directory already exists and en…
844f384 
…sure teh uninstall name is unique from version to version
@krzywon
Disable and ignore the density field if density is included in the fo…
688a2f4 
…rmula.
@krzywon
Move try/catch around calculations to capture Assertion error when th…
4286fa1 
…e formula includes the density and is incomplete
@llimeht
Check successful launch of sasview on CI (linux)
b29222d
@llimeht
Add additional Ubuntu packages for testing installer
04ddbcb
@krzywon
Set default settings to display mpl toolbar and hide PD plots
82c5d3d
@wpotrzebowski
Merge pull request #3070 from SasView/2816-ci-installer-exit-codes
9907656 
Check successful launch of sasview on CI (linux)
@wpotrzebowski
Merge branch 'release_6.0.0' into release_6.0.0-macos13
b1b5d95
@rozyczko
Fixed querying of the data dict at the removal step. Fixes #3015
cc21def
@wpotrzebowski
Update matrix.py
55b8ec9
@wpotrzebowski
Update matrix.py
ddc4434
@wpotrzebowski
Update matrix.py
a12316b
@wpotrzebowski
Update matrix.py
6021350
@wpotrzebowski
Update sasview.spec
572debc
@wpotrzebowski
Update sasview.spec
55e1ec3
@wpotrzebowski
Merge pull request #3074 from SasView/3057-default-config-values
2ebebcd 
3057: Change default settings
@wpotrzebowski
Update matrix.py
b7df8db
klytje and others added 21 commits October 22, 2024 18:38
@klytje
relaxed maximum deviation allowed in tests
665ba0c
@krzywon
Check if documentation path exists. Show 404 error if not found
37cf2b8
@klytje
reverted unnecessary changes
07b68b9
@klytje
reverted matrix
82af689
@krzywon
Include inline documentation for the new GPUOptions class variable
a7236a3
@krzywon
Modify the covariance calculation based on reviews
8f1b246
@krzywon
Remove print statement
a371f28
@klytje
Merge branch 'release_6.0.0' into mac_test
2efaab9
@smk78
Move weighting from Fitting Enhancement to New Features
a6c8361
@smk78
Minor furtling
b2fac8e
@smk78
Clarify name of new bulk ferromagnet model
cbd301b
@krzywon
Merge pull request #3129 from SasView/3126-opencl-and-covariance-issues
56a839b 
3126: Fix OpenCl and covariance issues
@krzywon
Do not attempt to load plugin model documentation and fall back to ba…
b546ad8 
…sic fitting help (for now)
@krzywon
Remove documentation generation from release notes (for now)
22a78ff
@krzywon
Update model name in release notes to match name in SasView
5d40983
@krzywon
Catch combined models when displaying documentation
0d887e0
@krzywon
Update documentation window release notes to highlight the new doc wi…
68c8462 
…ndow, but remove mention of documentation generation
@krzywon
Merge pull request #2882 from SasView/mac_test
fb5d45c 
Debye efficiency (macOS)
@krzywon
Merge pull request #3130 from SasView/final-release-notes
4cc7904 
v6.0.0: Final release notes
@krzywon
Merge pull request #3131 from SasView/mac-help-files-fix
2e519c4 
Release 6.0.0: Show 404 message instead of regen
@krzywon
merge main into release_6.0.0 and resolve conflicts
8d006f8
@wpotrzebowski
Copy link
Contributor

Shouldn't we deal with the three remaining 6.0.0 PRs before merging to main? I am particularly thinking of #2181

@lucas-wilkins
Copy link
Contributor

Shouldn't we deal with the three remaining 6.0.0 PRs before merging to main? I am particularly thinking of #2181

I think we need to get it merged!

lucas-wilkins
lucas-wilkins approved these changes Jan 8, 2025
View reviewed changes
Copy link
Contributor

@lucas-wilkins lucas-wilkins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty hard to follow in detail, but as far as the merge conflict goes, @krzywon is the one who will know best. I say merge.

@lucas-wilkins lucas-wilkins merged commit a8902fd into main Jan 8, 2025
19 checks passed
@lucas-wilkins lucas-wilkins deleted the merge-6-0-0-into-main branch January 8, 2025 14:25
@krzywon krzywon mentioned this pull request Jan 8, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucas-wilkins lucas-wilkins lucas-wilkins approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.