Merge pull request matplotlib#28593 from QuLogic/ruff-update

ksunden · web-flow · commit 9c69c3286463 · 2024-07-24T14:45:32.000-05:00
Update ruff to 0.2.0
diff --git a/.flake8 b/.flake8
@@ -34,17 +34,18 @@ exclude =
 
 per-file-ignores =
     lib/matplotlib/_cm.py: E202, E203, E302
-    lib/matplotlib/_mathtext.py: E221, E251
-    lib/matplotlib/_mathtext_data.py: E203, E261
+    lib/matplotlib/_mathtext.py: E221
+    lib/matplotlib/_mathtext_data.py: E203
     lib/matplotlib/backends/backend_template.py: F401
     lib/matplotlib/mathtext.py: E221
     lib/matplotlib/pylab.py: F401, F403
     lib/matplotlib/pyplot.py: F811
     lib/matplotlib/tests/test_mathtext.py: E501
-    lib/matplotlib/transforms.py: E201, E202, E203
+    lib/matplotlib/transforms.py: E201, E202
     lib/matplotlib/tri/_triinterpolate.py: E201, E221
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
+    lib/mpl_toolkits/mplot3d/proj3d.py: E201
 
     doc/conf.py: E402
     galleries/users_explain/quick_start.py: E402
diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
@@ -111,5 +111,5 @@ def _preprocess_data(
     label_namer: str | None = ...
 ) -> Callable: ...
 
-from matplotlib.cm import _colormaps as colormaps
-from matplotlib.colors import _color_sequences as color_sequences
+from matplotlib.cm import _colormaps as colormaps  # noqa: E402
+from matplotlib.colors import _color_sequences as color_sequences  # noqa: E402
diff --git a/lib/matplotlib/_api/__init__.pyi b/lib/matplotlib/_api/__init__.pyi
@@ -4,7 +4,7 @@ from typing_extensions import Self  # < Py 3.11
 
 from numpy.typing import NDArray
 
-from .deprecation import (  # noqa: re-exported API
+from .deprecation import (  # noqa: F401, re-exported API
     deprecated as deprecated,
     warn_deprecated as warn_deprecated,
     rename_parameter as rename_parameter,
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -379,27 +379,27 @@ def _get_info(self, fontname: str, font_class: str, sym: str, fontsize: float,
         xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox]
         offset = self._get_offset(font, glyph, fontsize, dpi)
         metrics = FontMetrics(
-            advance = glyph.linearHoriAdvance/65536.0,
-            height  = glyph.height/64.0,
-            width   = glyph.width/64.0,
-            xmin    = xmin,
-            xmax    = xmax,
-            ymin    = ymin+offset,
-            ymax    = ymax+offset,
+            advance=glyph.linearHoriAdvance / 65536,
+            height=glyph.height / 64,
+            width=glyph.width / 64,
+            xmin=xmin,
+            xmax=xmax,
+            ymin=ymin + offset,
+            ymax=ymax + offset,
             # iceberg is the equivalent of TeX's "height"
-            iceberg = glyph.horiBearingY/64.0 + offset,
-            slanted = slanted
-            )
+            iceberg=glyph.horiBearingY / 64 + offset,
+            slanted=slanted
+        )
 
         return FontInfo(
-            font            = font,
-            fontsize        = fontsize,
-            postscript_name = font.postscript_name,
-            metrics         = metrics,
-            num             = num,
-            glyph           = glyph,
-            offset          = offset
-            )
+            font=font,
+            fontsize=fontsize,
+            postscript_name=font.postscript_name,
+            metrics=metrics,
+            num=num,
+            glyph=glyph,
+            offset=offset
+        )
 
     def get_xheight(self, fontname: str, fontsize: float, dpi: float) -> float:
         font = self._get_font(fontname)
diff --git a/lib/matplotlib/axes/__init__.py b/lib/matplotlib/axes/__init__.py
@@ -1,5 +1,5 @@
 from . import _base
-from ._axes import Axes  # noqa: F401
+from ._axes import Axes
 
 # Backcompat.
 Subplot = Axes
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -14,7 +14,7 @@
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
 import matplotlib.contour as mcontour
-import matplotlib.dates  # noqa # Register date unit converter as side effect.
+import matplotlib.dates  # noqa: F401, Register date unit converter as side effect.
 import matplotlib.image as mimage
 import matplotlib.legend as mlegend
 import matplotlib.lines as mlines
diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi
@@ -202,7 +202,7 @@ class Axes(_AxesBase):
         *args: float | ArrayLike | str,
         scalex: bool = ...,
         scaley: bool = ...,
-        data = ...,
+        data=...,
         **kwargs
     ) -> list[Line2D]: ...
     def plot_date(
@@ -232,7 +232,7 @@ class Axes(_AxesBase):
         detrend: Callable[[ArrayLike], ArrayLike] = ...,
         usevlines: bool = ...,
         maxlags: int = ...,
-        data = ...,
+        data=...,
         **kwargs
     ) -> tuple[np.ndarray, np.ndarray, LineCollection | Line2D, Line2D | None]: ...
     def step(
@@ -241,7 +241,7 @@ class Axes(_AxesBase):
         y: ArrayLike,
         *args,
         where: Literal["pre", "post", "mid"] = ...,
-        data = ...,
+        data=...,
         **kwargs
     ) -> list[Line2D]: ...
     def bar(
@@ -252,7 +252,7 @@ class Axes(_AxesBase):
         bottom: float | ArrayLike | None = ...,
         *,
         align: Literal["center", "edge"] = ...,
-        data = ...,
+        data=...,
         **kwargs
     ) -> BarContainer: ...
     def barh(
@@ -263,7 +263,7 @@ class Axes(_AxesBase):
         left: float | ArrayLike | None = ...,
         *,
         align: Literal["center", "edge"] = ...,
-        data = ...,
+        data=...,
         **kwargs
     ) -> BarContainer: ...
     def bar_label(
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -49,7 +49,7 @@
     if QT_API_ENV in ["pyqt5", "pyside2"]:
         QT_API = _ETS[QT_API_ENV]
     else:
-        _QT_FORCE_QT5_BINDING = True  # noqa
+        _QT_FORCE_QT5_BINDING = True  # noqa: F811
         QT_API = None
 # A non-Qt backend was selected but we still got there (possible, e.g., when
 # fully manually embedding Matplotlib in a Qt app without using pyplot).
diff --git a/lib/matplotlib/contour.pyi b/lib/matplotlib/contour.pyi
@@ -3,7 +3,6 @@ from matplotlib.artist import Artist
 from matplotlib.axes import Axes
 from matplotlib.collections import Collection, PathCollection
 from matplotlib.colors import Colormap, Normalize
-from matplotlib.font_manager import FontProperties
 from matplotlib.path import Path
 from matplotlib.patches import Patch
 from matplotlib.text import Text
diff --git a/lib/matplotlib/gridspec.pyi b/lib/matplotlib/gridspec.pyi
@@ -3,7 +3,7 @@ from typing import Any, Literal, overload
 from numpy.typing import ArrayLike
 import numpy as np
 
-from matplotlib.axes import Axes, SubplotBase
+from matplotlib.axes import Axes
 from matplotlib.backend_bases import RendererBase
 from matplotlib.figure import Figure
 from matplotlib.transforms import Bbox
diff --git a/lib/matplotlib/lines.pyi b/lib/matplotlib/lines.pyi
@@ -2,7 +2,7 @@ from .artist import Artist
 from .axes import Axes
 from .backend_bases import MouseEvent, FigureCanvasBase
 from .path import Path
-from .transforms import Bbox, Transform
+from .transforms import Bbox
 
 from collections.abc import Callable, Sequence
 from typing import Any, Literal, overload
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -22,7 +22,7 @@
 from matplotlib import _api, _mathtext
 from matplotlib.ft2font import LOAD_NO_HINTING
 from matplotlib.font_manager import FontProperties
-from ._mathtext import (  # noqa: reexported API
+from ._mathtext import (  # noqa: F401, reexported API
     RasterParse, VectorParse, get_unicode_index)
 
 _log = logging.getLogger(__name__)
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -55,8 +55,9 @@
 import matplotlib.colorbar
 import matplotlib.image
 from matplotlib import _api
-from matplotlib import (  # noqa: F401 Re-exported for typing.
-    cm as cm, get_backend as get_backend, rcParams as rcParams, style as style)
+# Re-exported (import x as x) for typing.
+from matplotlib import cm as cm, get_backend as get_backend, rcParams as rcParams
+from matplotlib import style as style  # noqa: F401
 from matplotlib import _pylab_helpers
 from matplotlib import interactive  # noqa: F401
 from matplotlib import cbook
@@ -4017,7 +4018,7 @@ def spy(
         **kwargs,
     )
     if isinstance(__ret, cm.ScalarMappable):
-        sci(__ret)  # noqa
+        sci(__ret)
     return __ret
 
 
diff --git a/lib/matplotlib/spines.pyi b/lib/matplotlib/spines.pyi
@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterator, MutableMapping
-from typing import Any, Literal, TypeVar, overload
+from typing import Literal, TypeVar, overload
 
 import matplotlib.patches as mpatches
 from matplotlib.axes import Axes
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -637,7 +637,7 @@ def test_subs(self):
         sym = mticker.SymmetricalLogLocator(base=10, linthresh=1, subs=[2.0, 4.0])
         sym.create_dummy_axis()
         sym.axis.set_view_interval(-10, 10)
-        assert (sym() == [-20., -40.,  -2.,  -4.,   0.,   2.,   4.,  20.,  40.]).all()
+        assert_array_equal(sym(), [-20, -40, -2, -4, 0, 2, 4, 20, 40])
 
     def test_extending(self):
         sym = mticker.SymmetricalLogLocator(base=10, linthresh=1)
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -1183,7 +1183,7 @@ def test_tricontourf_decreasing_levels():
 
 def test_internal_cpp_api():
     # Following github issue 8197.
-    from matplotlib import _tri  # noqa: ensure lazy-loaded module *is* loaded.
+    from matplotlib import _tri  # noqa: F401, ensure lazy-loaded module *is* loaded.
 
     # C++ Triangulation.
     with pytest.raises(
diff --git a/lib/matplotlib/text.pyi b/lib/matplotlib/text.pyi
@@ -4,7 +4,7 @@ from .font_manager import FontProperties
 from .offsetbox import DraggableAnnotation
 from .path import Path
 from .patches import FancyArrowPatch, FancyBboxPatch
-from .textpath import (  # noqa: reexported API
+from .textpath import (  # noqa: F401, reexported API
     TextPath as TextPath,
     TextToPath as TextToPath,
 )
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -2574,9 +2574,9 @@ def get_matrix(self):
             if DEBUG and (x_scale == 0 or y_scale == 0):
                 raise ValueError(
                     "Transforming from or to a singular bounding box")
-            self._mtx = np.array([[x_scale, 0.0    , (-inl*x_scale+outl)],
-                                  [0.0    , y_scale, (-inb*y_scale+outb)],
-                                  [0.0    , 0.0    , 1.0        ]],
+            self._mtx = np.array([[x_scale,     0.0, -inl*x_scale+outl],
+                                  [    0.0, y_scale, -inb*y_scale+outb],
+                                  [    0.0,     0.0,               1.0]],
                                  float)
             self._inverted = None
             self._invalid = 0
@@ -2668,9 +2668,9 @@ def get_matrix(self):
                 raise ValueError("Transforming from a singular bounding box.")
             x_scale = 1.0 / inw
             y_scale = 1.0 / inh
-            self._mtx = np.array([[x_scale, 0.0    , (-inl*x_scale)],
-                                  [0.0    , y_scale, (-inb*y_scale)],
-                                  [0.0    , 0.0    , 1.0        ]],
+            self._mtx = np.array([[x_scale,     0.0, -inl*x_scale],
+                                  [    0.0, y_scale, -inb*y_scale],
+                                  [    0.0,     0.0,          1.0]],
                                  float)
             self._inverted = None
             self._invalid = 0
diff --git a/lib/matplotlib/widgets.pyi b/lib/matplotlib/widgets.pyi
@@ -4,7 +4,7 @@ from .backend_bases import FigureCanvasBase, Event, MouseEvent, MouseButton
 from .collections import LineCollection
 from .figure import Figure
 from .lines import Line2D
-from .patches import Circle, Polygon, Rectangle
+from .patches import Polygon, Rectangle
 from .text import Text
 
 import PIL.Image
diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py
@@ -23,10 +23,10 @@ def world_transformation(xmin, xmax,
         dy /= ay
         dz /= az
 
-    return np.array([[1/dx, 0,    0,    -xmin/dx],
-                     [0,    1/dy, 0,    -ymin/dy],
-                     [0,    0,    1/dz, -zmin/dz],
-                     [0,    0,    0,    1]])
+    return np.array([[1/dx,    0,    0, -xmin/dx],
+                     [   0, 1/dy,    0, -ymin/dy],
+                     [   0,    0, 1/dz, -zmin/dz],
+                     [   0,    0,    0,        1]])
 
 
 @_api.deprecated("3.8")
diff --git a/pyproject.toml b/pyproject.toml
@@ -112,6 +112,10 @@ exclude = [
     ".tox",
     ".eggs",
 ]
+line-length = 88
+target-version = "py310"
+
+[tool.ruff.lint]
 ignore = [
     "D100",
     "D101",
@@ -132,42 +136,46 @@ ignore = [
     "E741",
     "F841",
 ]
-line-length = 88
+preview = true
+explicit-preview-rules = true
 select = [
     "D",
     "E",
     "F",
     "W",
+    # The following error codes require the preview mode to be enabled.
+    "E201",
+    "E202",
+    "E203",
+    "E221",
+    "E251",
+    "E261",
+    "E272",
+    "E703",
 ]
 
-# The following error codes are not supported by ruff v0.0.240
+# The following error codes are not supported by ruff v0.2.0
 # They are planned and should be selected once implemented
 # even if they are deselected by default.
 # These are primarily whitespace/corrected by autoformatters (which we don't use).
 # See https://github.com/charliermarsh/ruff/issues/2402 for status on implementation
 external = [
   "E122",
-  "E201",
-  "E202",
-  "E203",
-  "E221",
-  "E251",
-  "E261",
-  "E272",
   "E302",
-  "E703",
 ]
 
-target-version = "py310"
-
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "doc/conf.py" = ["E402"]
 "galleries/examples/animation/frame_grabbing_sgskip.py" = ["E402"]
+"galleries/examples/images_contours_and_fields/tricontour_demo.py" = ["E201"]
+"galleries/examples/images_contours_and_fields/tripcolor_demo.py" = ["E201"]
+"galleries/examples/images_contours_and_fields/triplot_demo.py" = ["E201"]
 "galleries/examples/lines_bars_and_markers/marker_reference.py" = ["E402"]
 "galleries/examples/misc/print_stdout_sgskip.py" = ["E402"]
+"galleries/examples/misc/table_demo.py" = ["E201"]
 "galleries/examples/style_sheets/bmh.py" = ["E501"]
 "galleries/examples/subplots_axes_and_figures/demo_constrained_layout.py" = ["E402"]
 "galleries/examples/text_labels_and_annotations/custom_legends.py" = ["E402"]
@@ -184,18 +192,18 @@ convention = "numpy"
 "galleries/examples/user_interfaces/pylab_with_gtk4_sgskip.py" = ["E402"]
 "galleries/examples/userdemo/pgf_preamble_sgskip.py" = ["E402"]
 
-"lib/matplotlib/__init__.py" = ["E402", "F401"]
-"lib/matplotlib/_animation_data.py" = ["E501"]
-"lib/matplotlib/_api/__init__.py" = ["F401"]
-"lib/matplotlib/axes/__init__.py" = ["F401", "F403"]
+"lib/matplotlib/_cm.py" = ["E202", "E203"]
+"lib/matplotlib/_mathtext.py" = ["E221"]
+"lib/matplotlib/_mathtext_data.py" = ["E203"]
 "lib/matplotlib/backends/backend_template.py" = ["F401"]
-"lib/matplotlib/font_manager.py" = ["E501"]
-"lib/matplotlib/image.py" = ["F401", "F403"]
 "lib/matplotlib/pylab.py" = ["F401", "F403"]
-"lib/matplotlib/pyplot.py" = ["F401", "F811"]
+"lib/matplotlib/pyplot.py" = ["F811"]
 "lib/matplotlib/tests/test_mathtext.py" = ["E501"]
-"lib/mpl_toolkits/axisartist/__init__.py" = ["F401"]
-"lib/pylab.py" = ["F401", "F403"]
+"lib/matplotlib/transforms.py" = ["E201"]
+"lib/matplotlib/tri/_triinterpolate.py" = ["E201", "E221"]
+"lib/mpl_toolkits/axes_grid1/axes_size.py" = ["E272"]
+"lib/mpl_toolkits/axisartist/angle_helper.py" = ["E221"]
+"lib/mpl_toolkits/mplot3d/proj3d.py" = ["E201"]
 
 "galleries/users_explain/artists/paths.py" = ["E402"]
 "galleries/users_explain/artists/patheffects_guide.py" = ["E402"]
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
