Enable ruff's preview whitespace linting rules

QuLogic · QuLogic · commit 7ca34918ecc7 · 2024-07-19T00:31:31.000-04:00
These are the ones we were using with flake8, but were not available
before ruff 0.2.0 (or at least whatever the last tested version was).

Also, clean up a bit of the code so that we only use one type of
whitespace exception.
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/_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/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/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
@@ -136,11 +136,21 @@ ignore = [
     "E741",
     "F841",
 ]
+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",
 ]
 
 # The following error codes are not supported by ruff v0.2.0
@@ -150,13 +160,6 @@ select = [
 # See https://github.com/charliermarsh/ruff/issues/2402 for status on implementation
 external = [
   "E122",
-  "E201",
-  "E202",
-  "E203",
-  "E221",
-  "E251",
-  "E261",
-  "E272",
   "E302",
   "E703",
 ]
@@ -167,8 +170,12 @@ convention = "numpy"
 [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"]
@@ -188,14 +195,22 @@ convention = "numpy"
 "lib/matplotlib/__init__.py" = ["E402", "F401"]
 "lib/matplotlib/_animation_data.py" = ["E501"]
 "lib/matplotlib/_api/__init__.py" = ["F401"]
+"lib/matplotlib/_cm.py" = ["E202", "E203"]
+"lib/matplotlib/_mathtext.py" = ["E221"]
+"lib/matplotlib/_mathtext_data.py" = ["E203"]
 "lib/matplotlib/axes/__init__.py" = ["F401", "F403"]
 "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/tests/test_mathtext.py" = ["E501"]
+"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/__init__.py" = ["F401"]
+"lib/mpl_toolkits/axisartist/angle_helper.py" = ["E221"]
+"lib/mpl_toolkits/mplot3d/proj3d.py" = ["E201"]
 "lib/pylab.py" = ["F401", "F403"]
 
 "galleries/users_explain/artists/paths.py" = ["E402"]
