Ready release candidate v6.11.0.2rc2 #38469
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is all of the changes from #38420 Co-authored-by: Thomas Hampson <thomas.hampson@stfc.ac.uk> envoke ruff rule NPY201 additional numpy 2 fixes Avoid passing None to cbook.safe_masked_invalid To be compatible wiht Numpy 2, avoid giving None to mpl's safe_masked_invalid method which constructs a numpy array x = np.array(x, subok=True, copy=copy), producing an error with a None type in Numpy 2. Update pystog to v0.5.0 added release note
This is a squashed version of #38351 There were a number of places that triggered a dangling-reference warning, but a lot look like false positives to me.. Also several places had unnecessary std::move() on a string argument in a constructor that was being passed by reference. Fix cppcheck warnings I fixed two warnings and deleted the suppressions, but the unusedScopedObject warning wasn't obvious how to fix. Fix maybe-uninitialized warnings from gcc 13 Disable warnings from gcc 13 In gcc 12, any use of _ in Google Mock would generate a maybe-uninitialized warning, but now it generates an uninitialized warning, so I've changed over the cmake that disables those warnings.
This is a squashed version of #38100 Fix accummulate blunder from 5 years ago See 6b99e15 for where the old code was broken in a refactor. Added release note Fix cppcheck warnings about const parameters Use new method for type checking a cast Instead of using the same code everywhere to check that a cast is not null, use a new generic method that can do this. Add tests for new DynamicPointerCastHelper method Remove unnecessary __declspec on method On Windows with msbuild you cannot define the function implementation with a __declspec, but it works fine with Clang and gcc. Use helper method to check for null cast
This affects VULCAN from 2021 on when loading a single bank of data. Since the detector ids do not increase with components, there was an implicit assumption that was being violated.
Update gcc to version 13 - ornlnext
This brings #38342 into ornl-next In Clang 17 a new optimisation was introduced that breaks some of our tests, e.g. SplineSmoothingTest, so I've disabled that option. Use smart pointers instead of raw pointers Disable compiler extensions This should give us more consistent behaviour across different compilers.
This gets the changes from #38142 into ornl-next Most fixes were for copying in instead of moving in to a method that I've recently added to fix Coverity warnings about null objects. The changes in FindPeaksConvolve were because m_pdf was being either read or written to without the lock. Refactor to avoid potential null cast This refactor will protect against a null cast in the case of a non-MultiDomainFunction being passed in.
This brings #38397 into ornl-next constVariablePointer cppcheck fixes
This is a squashed version of #38092 Release notes added
This is a squash of #38435 Modify test that bounding box is bigger than the shape The other checks that the 3d view is cubic remain Fix IntegratePeaksSkew 'x must be a sequence' Change listed in mpl 3.9 release notes https://matplotlib.org/3.9.0/api/prev_api_changes/api_changes_3.9.0.html#line2d Update release note to include link for matplotlib 3.9
This is a squashed versino of #38299 Moved mslice from mantid to mantidworkbench recipe Add mantid channel to conda build command Only pass channel to mantid-developer and mantidworkbench Removed quotation marks from channel option Added space after debug option back Use classic solver with mamba Corrected solver argument Install classic solver Add mantid channel via conda config Add conda-forge after mantid for higher priority Use Mslice with seperate_mslice_test label Updated copyright year Only install mslice for workbench Added release note Use mantid/label/main instead of mantid Updated installers and pinned mslice to 2.10 Check for correct MSlice version before building release of Mantid Updated mslice interface Update dev-docs/source/ReleaseChecklist.rst Co-authored-by: Jonathan Haigh <35813666+jhaigh0@users.noreply.github.com> Update installers/conda/win/create_package.sh Co-authored-by: thomashampson <thomas.hampson@stfc.ac.uk>
clang18 and coverity changes into ornl-next
…can_bank LoadEventNexus error when loading single vulcan bank - ornl-next
Breaking change to HTTPSClientSession in latest Poco version.
This is a squash of #38461 Remove 1.14 Poco pin Remove old Poco CMake code These bits of CMake were preventing the solution compiling on Windows. 1.4.6 is around 10 years old. Remove old Poco pin The latest version is 1.14, so no need to keep bit of the pin for 1.12.1 Update pin and comment The new HTTPSClientSession API won't work with Poco < 1.14, so we need to pin it to at least 1.14
Pin Poco away from 1.14.0 - ornl-next
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Advancing to make release candidate: v6.11.0.2rc2
This pull request includes various changes across multiple files to improve code quality, fix issues, and enhance functionality. The most important changes are grouped by theme below:
Codebase Simplification and Refactoring:
Framework/Algorithms/src/FindPeaksConvolve.cpp: Added parallel region checks and mutex locks to ensure thread safety during convolution operations. [1] [2] [3] [4] [5]Framework/Algorithms/src/CalculateCarpenterSampleCorrection.cpp: Removed an unused variable to clean up the code.Framework/Algorithms/src/WeightedMeanOfWorkspace.cpp: Moved theweightvariable inside the loop to limit its scope.Bug Fixes:
Framework/API/src/NumericAxis.cpp: Fixed an issue where the iterator was not being updated correctly after erasing a character fromnumberLabel.Framework/Algorithms/test/FileFinderTest.h: ReplacedTS_ASSERT_THROWS_ANYTHINGwithTS_ASSERTto check for file existence more accurately.Code Quality Improvements:
Framework/Algorithms/test/CalculateCarpenterSampleCorrectionTest.h: Added warning suppression macros to handle compiler-specific warnings. [1] [2] [3]Framework/Algorithms/test/CarpenterSampleCorrectionTest.h: Added warning suppression macros to handle compiler-specific warnings. [1] [2] [3]Removal of Redundant Code:
Framework/Algorithms/src/Stitch.cpp: Removed theCOMBINATION_BEHAVIOUR_PROPERTYas it was not being used. [1] [2] [3]Framework/Algorithms/src/GroupWorkspaces.cpp: Removed an unused variableoutputWorkspace.Build Configuration:
Framework/API/test/CMakeLists.txt: Updated compiler options to suppress a different set of warnings. [1] [2]