Skip to content

Commit f42775c

Browse files
Merge pull request #38109 from mantidproject/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents c89b6ba + 0c6cb1d commit f42775c

File tree

9 files changed

+13
-16
lines changed

9 files changed

+13
-16
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ repos:
2424
exclude: conda/recipes/mantid/meta.yaml|conda/recipes/mantid-developer/meta.yaml|conda/recipes/mantidqt/meta.yaml|conda/recipes/mantiddocs/meta.yaml|conda/recipes/mantidworkbench/meta.yaml
2525

2626
- repo: https://github.com/pre-commit/mirrors-clang-format
27-
rev: v11.1.0 # updating to a new version should wait until maintenance
27+
rev: v12.0.1 # updating to a new version should wait until maintenance
2828
hooks:
2929
- id: clang-format
3030
exclude: Testing/Tools/cxxtest|tools
3131

3232
- repo: https://github.com/mantidproject/pre-commit-hooks.git
33-
rev: 2f8a4f22629d0d23332f621df9de93751331161b
33+
rev: 17c2842277953a4afcbca26bf84e8956f729e765
3434
hooks:
3535
- id: cmake-missing-pytest-files
3636
# Exclude sphinx / template file
@@ -59,7 +59,7 @@ repos:
5959
)$
6060
6161
- repo: https://github.com/astral-sh/ruff-pre-commit
62-
rev: v0.6.4
62+
rev: v0.6.8
6363
# ruff must appear before black in the list of hooks
6464
hooks:
6565
- id: ruff

Framework/API/src/GroupingLoader.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ void GroupingLoader::loadGroupingFromXML(const std::string &filename, Grouping &
175175
try // ... to convert value to double
176176
{
177177
grouping.pairAlphas[ip] = boost::lexical_cast<double>(aElement->getAttribute("val"));
178-
}
179-
catch (boost::bad_lexical_cast &) {
178+
} catch (boost::bad_lexical_cast &) {
180179
throw Mantid::Kernel::Exception::FileError("Pair alpha value is not a number", filename);
181180
}
182181
}

Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// clang-format on
2121

2222
// Poco
23+
#include <Poco/DOM/DOMParser.h>
2324
#include <Poco/DOM/Document.h>
2425
#include <Poco/DOM/Element.h>
25-
#include <Poco/DOM/DOMParser.h>
2626
#include <Poco/DOM/NodeList.h>

Framework/DataHandling/src/LoadMuonNexus1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
#include <algorithm>
4444
#include <cmath>
45-
#include <memory>
4645
#include <limits>
46+
#include <memory>
4747

4848
namespace Mantid::DataHandling {
4949
using namespace DataObjects;

Framework/DataHandling/src/LoadRKH.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
#include <boost/date_time/gregorian/gregorian.hpp>
2424
#include <boost/date_time/date_parsing.hpp>
2525
// clang-format on
26-
#include <boost/lexical_cast.hpp>
27-
#include <boost/algorithm/string.hpp>
2826
#include "MantidKernel/StringTokenizer.h"
27+
#include <boost/algorithm/string.hpp>
28+
#include <boost/lexical_cast.hpp>
2929

30+
#include <boost/regex.hpp>
3031
#include <istream>
3132
#include <numeric>
32-
#include <boost/regex.hpp>
3333

3434
namespace {
3535
// Check if we are dealing with a unit line

Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <nexus/NeXusException.hpp>
1919
// clang-format on
2020

21+
#include <Poco/Exception.h>
2122
#include <Poco/File.h>
2223
#include <Poco/Path.h>
23-
#include <Poco/Exception.h>
2424

2525
using namespace Mantid::Kernel;
2626
using namespace Mantid::API;

Framework/SINQ/inc/MantidSINQ/LoadFlexiNexus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
// clang-format on
3636

3737
#include "MantidDataObjects/Workspace2D.h"
38-
#include <memory>
3938
#include "MantidGeometry/MDGeometry/MDHistoDimension.h"
39+
#include <memory>
4040

4141
class MANTID_SINQ_DLL LoadFlexiNexus : public Mantid::API::Algorithm {
4242
public:

qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ void ALCDataLoadingPresenter::updateAvailableInfo() {
292292
loadedWs = loadAlg->getProperty("OutputWorkspace");
293293
firstGoodData = loadAlg->getProperty("FirstGoodData");
294294
timeZero = loadAlg->getProperty("TimeZero");
295-
}
296-
catch (const std::exception &error) {
295+
} catch (const std::exception &error) {
297296
m_view->setAvailableInfoToEmpty();
298297
throw std::runtime_error(error.what());
299298
}

qt/widgets/common/src/FunctionBrowser/FunctionBrowserUtils.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ std::pair<std::string, std::pair<std::string, std::string>> splitConstraintStrin
9292
try // find position of the parameter name in expression
9393
{
9494
boost::lexical_cast<double>(expr[1].name());
95-
}
96-
catch (...) {
95+
} catch (...) {
9796
paramPos = 1;
9897
}
9998
std::string op = expr[1].operator_name();

0 commit comments

Comments
 (0)