Skip to content

Qa#960

Merged
fanchercm merged 182 commits intomainfrom
qa_merge
Feb 3, 2026
Merged

Qa#960
fanchercm merged 182 commits intomainfrom
qa_merge

Conversation

@fanchercm
Copy link
Collaborator

@fanchercm fanchercm commented Feb 3, 2026

Short description of the changes:

Long description of the changes:

Check list for the pull request

  • I have read the [CONTRIBUTING]
  • I have read the [CODE_OF_CONDUCT]
  • I have added tests for my changes
  • I have updated the documentation accordingly

Check list for the reviewer

  • I have read the [CONTRIBUTING]
  • I have verified the proposed changes
  • best software practices
    • all internal functions have an underbar, as is python standard
    • clearly named variables (better to be verbose in variable names)
    • code comments explaining the intent of code blocks
  • All the tests are passing
  • The documentation is up to date
  • code comments added when explaining intent

Manual test for the reviewer

References

Fancher and others added 30 commits April 15, 2024 13:27
inital commit for excluding subruns
a6fe506
@fanchercm
added tracking to exclude points
3b1b3d7
@fanchercm
fix mypy errors
f67c37a
@fanchercm
Merge pull request #865 from neutrons/exclude_points
7e59356 
Exclude points
@fanchercm
fix calibration paramview
5913d25
@fanchercm
Merge pull request #866 from neutrons/fix_calibration_paramview
e9f281a 
fix calibration paramview
fix exclude
6fc9e0d
@fanchercm
Merge pull request #870 from neutrons/exclude_points_redevelop
0956506 
fix exclude
fix exclude
d2de327
@fanchercm
Merge pull request #871 from neutrons/exclude_points_redevelop
2f2da0d 
fix exclude
@fanchercm
changed how time averaged data are pulled
e62f6b9
@fanchercm
reset fit_results to catch error
2508df2
@fanchercm
Merge pull request #872 from neutrons/fix_time_averaged
8813531 
changed how time averaged data are pulled
@fanchercm
Merge pull request #873 from neutrons/fix_exclude_points
b865dc8 
reset fit_results to catch error
removed vtk from environment file
f6b5d79
removed vtk from conda.recipe
6a8a4d7
@fanchercm
remove vtk from meta.yaml run section
e4f3e38
@fanchercm
Merge pull request #874 from neutrons/test_remove_vtk
8cf0b41 
removed vtk from environment file
@fanchercm
added effective params to project file
d1c5f06
@fanchercm
disable export fitting when no file is loaded
38fc765
@fanchercm
Merge pull request #881 from neutrons/save_effective_params
c47162d 
added effective params to project file
@fanchercm
Merge pull request #882 from neutrons/fix_nopeakcollection_crash
62eb44b 
disable export fitting when no file is loaded
@fanchercm
added quadratic background
1ead534
@searscr @fanchercm
Enable UI tests (#877)
b277f1f 
* fix segfault in tests

* enable tests

* add comments

* fix formatting

* try-fix github actions

* fix texture fitting error

---------

Co-authored-by: Chris Fancher <fanchercm@ornl.gov>
@fanchercm
inital commit allowing appended project files
6d3e9ff
@fanchercm
updated tests for additional effective param
35dce7f
@fanchercm
updated tests for additional effective param
01f481a
@fanchercm
changed the errors added to A2 variable when linear backgrounds are used
e342a90
@fanchercm
changed error array for non linear background
f11ec91
@fanchercm
added test for Quadratic background
f2ea722
glass-ships and others added 28 commits January 16, 2026 13:58
@glass-ships
forgot to add project id
b77a8c3
@glass-ships
only run on pushes to next again
4752c91
@glass-ships
Merge pull request #955 from neutrons/gitlab-deploy
57a82f9 
Add workflow step to trigger gitlab deploy
@fanchercm
fix for multiple fit windows returning no strain
a63756d
@fanchercm
Merge pull request #956 from neutrons/fix_strain_error
3de2199 
fix for multiple fit windows returning no strain
@fanchercm
testing unit change
b498de0
@fanchercm
fix pixi lock
b0677f2
@fanchercm
fix pixi lock
7a80503
@fanchercm
fix pixi lock
1044878
@fanchercm
fix pixi lock
9e55544
@fanchercm
fix pixi lock
c1a4304
@fanchercm
Merge pull request #957 from neutrons/fix_pixi_error
359fc65 
testing unit change
@peterfpeterson
Change to ruff and run formatting
7592c40
@peterfpeterson
Have ruff check fix issues when it knows how
b156ebb
@fanchercm
fix ruff formating error
1d4ca55
@fanchercm
fix ruff formating error
6b85bff
@fanchercm
fix ruff formating error
7de7a60
@fanchercm
fix ruff formating error
ece6509
@fanchercm
Merge pull request #952 from neutrons/flake8_ruff
7ac9168 
transition from flake8 to using ruff with formatting check
@peterfpeterson
Configure a bunch of pre-commit hooks
c5f6a43
@peterfpeterson
Update lockfile
c4505b8
@walshmm
change the versioning method to that of the template repo
409b0a2
@walshmm
update pixi lock file
70776a0
@walshmm
Merge pull request #951 from neutrons/migrate_version_to_current_temp…
00f17cd 
…late_method

change the versioning method to that of the template repo
@walshmm
update pyproject.toml to not incorrectly replace the version in _vers…
0f457ad 
…ion.py with next_version
@walshmm
update pixi lockfile
4499f7f
@walshmm
Merge pull request #958 from neutrons/update_versioning_to_not_replac…
fb04e24 
…e_incorrectly

Update versioning to not replace incorrectly
@fanchercm
Merge branch 'main' into qa_merge
ee2e25c
@fanchercm fanchercm merged commit f06f4e0 into main Feb 3, 2026
9 checks passed
@fanchercm fanchercm deleted the qa_merge branch February 3, 2026 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@fanchercm @searscr @walshmm @peterfpeterson @ekapadi @dlcaballero16 @glass-ships