Merge pull request #38346 from peterfpeterson/matplotlib_and_ruff

Matplotlib 3.8 and ruff E402 - ornl-next

Author: peterfpeterson

Framework/PythonInterface/mantid/plots/mantidaxes.py

@@ -12,6 +12,7 @@
 import numpy as np
 import re
 
+from cycler import cycler
 from matplotlib.axes import Axes
 from matplotlib.cbook import safe_masked_invalid
 from matplotlib.collections import Collection, PolyCollection
@@ -22,6 +23,7 @@
 from matplotlib.patches import Patch
 from matplotlib.table import Table
 from matplotlib.ticker import NullLocator
+import matplotlib.pyplot as plt
 from mpl_toolkits.mplot3d import Axes3D
 
 from mantid import logger
@@ -145,7 +147,9 @@ def from_mpl_axes(ax, ignore_artists=None):
         """
         if not ignore_artists:
             ignore_artists = []
-        prop_cycler = ax._get_lines.prop_cycler  # tracks line color cycle
+
+        default_cycle_colours = plt.rcParams["axes.prop_cycle"].by_key()["color"]
+        number_of_mpl_lines = len(ax.get_lines())
         artists = ax.get_children()
         mantid_axes = ax.figure.add_subplot(111, projection="mantid", label="mantid")
         for artist in artists:
@@ -155,7 +159,14 @@ def from_mpl_axes(ax, ignore_artists=None):
                 except NotImplementedError:
                     pass
         mantid_axes.set_title(ax.get_title())
-        mantid_axes._get_lines.prop_cycler = prop_cycler
+
+        if number_of_mpl_lines > 0:
+            used_colors = default_cycle_colours[: (number_of_mpl_lines % len(default_cycle_colours)) + 1]
+            remaining_colors = default_cycle_colours[(number_of_mpl_lines % len(default_cycle_colours)) + 1 :]
+            default_cycle_colours = remaining_colors + used_colors
+
+        mantid_axes.set_prop_cycle(cycler(color=default_cycle_colours))
+
         ax.remove()
         return mantid_axes
 

Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py

@@ -5,6 +5,7 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=too-many-branches,too-many-locals, invalid-name
+# ruff: noqa: E741  # Ambiguous variable name
 from mantid.api import AlgorithmFactory, FileAction, FileProperty, PythonAlgorithm, WorkspaceProperty
 from mantid.kernel import Direction
 from mantid.simpleapi import logger, CreateWorkspace

Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py

@@ -5,6 +5,7 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=too-many-branches,too-many-locals, invalid-name
+# ruff: noqa: E741  # Ambiguous variable name
 from mantid.api import AlgorithmFactory, FileAction, FileProperty, PythonAlgorithm, WorkspaceProperty
 from mantid.kernel import Direction
 from mantid.simpleapi import logger, CreateWorkspace

Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py

@@ -5,6 +5,7 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,invalid-name
+# ruff: noqa: E741  # Ambiguous variable name
 import mantid.simpleapi as api
 from mantid.api import (
     AlgorithmFactory,

Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py

@@ -773,10 +773,10 @@ def _sum_rom(self, n_scat, n_abs, a, r1, r2, ms, theta, amu_scat, amu_tot_i, amu
             Area_y = r * r_step * omega_ster * amu_scat[n_scat]
             sum_1 = 0.0
             sum_2 = 0.0
-            I = 1
+            i = 1
             Area_sum = 0.0
             for _ in range(1, number_omega + 1):
-                omega = I * omega_ster + omega_deg
+                omega = i * omega_ster + omega_deg
                 distance = r * math.sin(omega)
 
                 skip = True
@@ -790,11 +790,11 @@ def _sum_rom(self, n_scat, n_abs, a, r1, r2, ms, theta, amu_scat, amu_tot_i, amu
                         LIS.append(LISN - LIST)
                     #
                     # CALCULATE DISTANCE SCATTERED NEUTRON PASSES THROUGH EACH ANNULUS
-                    O = omega + theta_deg
+                    omega_scattered = omega + theta_deg
                     LSS = []
                     for j in range(0, nan):
-                        LSST = self._distance(r, self._radii[j], O)
-                        LSSN = self._distance(r, self._radii[j + 1], O)
+                        LSST = self._distance(r, self._radii[j], omega_scattered)
+                        LSSN = self._distance(r, self._radii[j + 1], omega_scattered)
                         LSS.append(LSSN - LSST)
                     #
                     # CALCULATE ABSORPTION FOR PATH THROUGH ALL ANNULI,AND THROUGH INNER ANNULI
@@ -810,9 +810,9 @@ def _sum_rom(self, n_scat, n_abs, a, r1, r2, ms, theta, amu_scat, amu_tot_i, amu
                     skip = False
 
                 if skip:
-                    I = number_omega - I + 2
+                    i = number_omega - i + 2
                 else:
-                    I += 1
+                    i += 1
         AAA += sum_1 * Area_y
         BBB += sum_2 * Area_y
         Area += Area_sum * Area_y

Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py

@@ -4,6 +4,7 @@
 #   NScD Oak Ridge National Laboratory, European Spallation Source,
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
+# ruff: noqa: E741  # Ambiguous variable name
 from mantid.api import PythonAlgorithm, AlgorithmFactory, IMDHistoWorkspaceProperty, PropertyMode, WorkspaceProperty, Progress
 from mantid.kernel import (
     Direction,

Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py

@@ -4,6 +4,7 @@
 #   NScD Oak Ridge National Laboratory, European Spallation Source,
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
+# ruff: noqa: E741  # Ambiguous variable name
 from contextlib import contextmanager
 import numpy
 import os

Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py

@@ -117,8 +117,8 @@ def PyExec(self):
                     groupname = str(groupnum)
                     ids = spectra[i, j : j + pixelsx, k : k + pixelsy].reshape(-1)
                     detids = []
-                    for l in ids:
-                        detids.append(__w.getDetector(int(l)).getID())
+                    for id in ids:
+                        detids.append(__w.getDetector(int(id)).getID())
 
                     detids = str(detids).replace("[", "").replace("]", "")
 

Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py

@@ -285,8 +285,8 @@ def _get_value(name, default=None):
             if len(meta_data.strip()) > 0:
                 content += "#\n"
                 lines = meta_data.strip().split("\n")
-                for l in lines:
-                    content += "# %s\n" % l
+                for line in lines:
+                    content += f"# {line}\n"
                 content += "#\n"
         except:
             logger.error("Could not write meta-data to reflectivity file.")

Framework/PythonInterface/plugins/algorithms/LinkedUBs.py

@@ -4,6 +4,7 @@
 #   NScD Oak Ridge National Laboratory, European Spallation Source,
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
+# ruff: noqa: E741  # Ambiguous variable name
 from mantid.api import DataProcessorAlgorithm, mtd, AlgorithmFactory, WorkspaceProperty, PropertyMode, ITableWorkspaceProperty
 from mantid.simpleapi import CalculateUMatrix, PredictPeaks, FilterPeaks, DeleteWorkspace, CreatePeaksWorkspace
 from mantid.kernel import Direction, FloatBoundedValidator, IntBoundedValidator, StringMandatoryValidator, StringListValidator, V3D