Merge branch 'release-next' into enable_changing_of_wildes_flipper_config

Author: MialLewis

.github/filters.yaml

@@ -8,4 +8,13 @@ doxygen:
  - 'conda/recipes/conda_build_config.yaml'
  - '.github/filters.yaml'
  - '.github/actions/doxygen-build/**'
- - '.github/workflows/doxygen.yml'
+ - '.github/workflows/doxygen-publish.yml'
+ - 'pixi.toml'
+devsite:
+ - 'dev-docs/**'
+ - 'conda/recipes/mantid-developer/**'
+ - 'conda/recipes/conda_build_config.yaml'
+ - '.github/filters.yaml'
+ - '.github/actions/devsite-build/**'
+ - '.github/workflows/devdocs-publish.yml'
+ - 'pixi.toml'

.github/workflows/devdocs-publish.yml

@@ -0,0 +1,71 @@
+name: Build developer docs
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main, release-next]
+
+# cancel previous job if new commit is pushed
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  devsite:
+    if: ${{ github.repository_owner == 'mantidproject' }}
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - name: Checkout Mantid source
+        uses: actions/checkout@v6
+
+      - name: Detect changes relevant to developer site
+        uses: dorny/paths-filter@v4
+        id: changes
+        with:
+          filters: .github/filters.yaml
+
+      - name: Read pixi version
+        id: pixi-version
+        run: echo "version=$(tr -d '[:space:]' < .pixi-version)" >> "$GITHUB_OUTPUT"
+
+      - name: Setup pixi
+        if: steps.changes.outputs.devsite == 'true'
+        uses: prefix-dev/setup-pixi@v0.9.5
+        with:
+          pixi-version: v${{ steps.pixi-version.outputs.version }}
+          frozen: true
+
+      - name: Build dev-docs
+        if: steps.changes.outputs.devsite == 'true'
+        run: pixi run --manifest-path pixi.toml build-devdocs
+
+      - name: Checkout developer site repository
+        if: ${{ steps.changes.outputs.devsite == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        uses: actions/checkout@v6
+        with:
+          repository: mantidproject/developer
+          ref: gh-pages
+          path: developer_repo
+          token: ${{ secrets.DEVELOPER_REPO_TOKEN }}
+
+      - name: Copy generated site
+        if: ${{ steps.changes.outputs.devsite == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: |
+          rm -rf developer_repo/*
+          cp -r build_devsite_html/* developer_repo/
+
+      # publish devsite to mantidproject/developer repo when merged to main branch
+      - name: Publish developer site
+        if: ${{ steps.changes.outputs.devsite == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        working-directory: developer_repo
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add .
+          git diff --cached --quiet && echo "No changes to commit" && exit 0
+          git commit -m "Automatic update of developer site from ${{ github.sha }}"
+          git push origin gh-pages

.github/workflows/update-pixi-lockfile.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   # change this between main and release-next
-  UPDATE_BRANCH: main
+  UPDATE_BRANCH: release-next
 
 jobs:
   pixi-update-lockfile:

.pre-commit-config.yaml

@@ -76,7 +76,7 @@ repos:
         - mdformat-ruff # ruff format code snippets
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.12
+    rev: v0.15.13
     # ruff must appear before black in the list of hooks
     hooks:
       - id: ruff-check

Framework/API/inc/MantidAPI/IAlgorithmRuntimeProps.h

@@ -13,7 +13,7 @@ namespace Mantid::API {
 class MANTID_API_DLL IAlgorithmRuntimeProps : public virtual Mantid::Kernel::IPropertyManager {
 public:
   IAlgorithmRuntimeProps() = default;
-  virtual ~IAlgorithmRuntimeProps() = default;
+  ~IAlgorithmRuntimeProps() override = default;
 
   using Mantid::Kernel::IPropertyManager::getDeclaredPropertyNames;
 

Framework/API/inc/MantidAPI/IFunction.h

@@ -720,7 +720,7 @@ class MANTID_API_DLL IFunction {
   /// The covariance matrix of the fitting parameters
   std::shared_ptr<Kernel::Matrix<double>> m_covar;
   /// The chi-squared of the last fit
-  double m_chiSquared;
+  double m_chiSquared{0.0};
   /// Holds parameter ties
   std::vector<std::unique_ptr<ParameterTie>> m_ties;
   /// Holds the constraints added to function

Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h

@@ -38,6 +38,7 @@ class MANTID_API_DLL IPowderDiffPeakFunction : public virtual API::ParamFunction
   /// Set peak's height
   virtual void setHeight(const double h);
   /// Set peak's radius
+  // cppcheck-suppress virtualCallInConstructor
   virtual void setPeakRadius(const int &r);
 
   //--------------- ThermalNeutron peak function special

Framework/API/inc/MantidAPI/MatrixWorkspace.h

@@ -396,7 +396,7 @@ class MANTID_API_DLL MatrixWorkspace : public IMDWorkspace, public ExperimentInf
 
   const std::string &YUnit() const { return m_YUnit; }
   void setYUnit(const std::string &newUnit);
-  std::string YUnitLabel(bool useLatex = false, bool plotAsDistribution = false) const;
+  std::string YUnitLabel(bool useLatex = false) const;
   void setYUnitLabel(const std::string &newLabel);
 
   /// Are the Y-values dimensioned?

Framework/API/inc/MantidAPI/ParamFunction.h

@@ -33,7 +33,7 @@ class Jacobian;
 class MANTID_API_DLL ParamFunction : public virtual IFunction {
 public:
   /// Default constructor
-  ParamFunction() {}
+  ParamFunction() : IFunction() {}
 
   /// Set i-th parameter
   void setParameter(size_t, const double &value, bool explicitlySet = true) override;

Framework/API/inc/MantidAPI/ParameterTie.h

@@ -39,11 +39,11 @@ class MANTID_API_DLL ParameterTie final : public ParameterReference {
   /// Destructor
   ~ParameterTie() override;
   /// Set the tie expression
-  virtual void set(const std::string &expr);
+  void set(const std::string &expr);
   /// Evaluate the expression
-  virtual double eval(bool setParameterValue = true);
+  double eval(bool setParameterValue = true);
   /// Return the string that can be used to recreate this tie
-  virtual std::string asString(const IFunction *fun = nullptr) const;
+  std::string asString(const IFunction *fun = nullptr) const;
 
   /// Check if the tie has any references to certain parameters
   bool findParametersOf(const IFunction *fun) const;