Merge pull request #70 from mfisher87/pep8-naming

Pep8 naming partial compliance

Author: stefanv

.git-blame-ignore-revs

@@ -3,3 +3,6 @@
 
 # Applied `pre-commit` `end-of-file-fixer`
 e9104b3616899f54257bb38959d6e1c0acc70f6a
+
+# Applied `ruff` `pep8-naming` rules
+1eb35bbb81a8f3f72cf5c2cb44d3dd94d4c15c32

pyproject.toml

@@ -50,7 +50,24 @@ target-version = ["py38", "py39", "py310", "py311"]
 
 [tool.ruff]
 target-version = "py38"
-select = ["F", "E", "W", "C90", "I", "UP", "YTT", "B", "A", "C4", "T10", "RUF"]
+select = [
+  "F",
+  "E",
+  "W",
+  "C90",
+  "I",
+  "N",
+  "UP",
+  "YTT",
+  "B",
+  "A",
+  "C4",
+  "T10",
+  "RUF",
+]
+
+[tool.ruff.per-file-ignores]
+"viscm/gui.py" = ["N8"]
 
 [tool.ruff.mccabe]
 max-complexity = 11

viscm/bezierbuilder/curve.py

@@ -4,7 +4,7 @@
 from scipy.special import binom
 
 
-def Bernstein(n, k):
+def bernstein(n, k):
     """Bernstein polynomial."""
     coeff = binom(n, k)
 
@@ -14,7 +14,7 @@ def _bpoly(x):
     return _bpoly
 
 
-def Bezier(points, at):
+def bezier(points, at):
     """Build Bézier curve from points."""
     warnings.warn(
         message="Deprecated. CatmulClark builds nicer splines.",
@@ -24,14 +24,14 @@ def Bezier(points, at):
 
     at = np.asarray(at)
     at_flat = at.ravel()
-    N = len(points)
+    n = len(points)
     curve = np.zeros((at_flat.shape[0], 2))
-    for ii in range(N):
-        curve += np.outer(Bernstein(N - 1, ii)(at_flat), points[ii])
+    for ii in range(n):
+        curve += np.outer(bernstein(n - 1, ii)(at_flat), points[ii])
     return curve.reshape((*at.shape, 2))
 
 
-def CatmulClark(points, at):
+def catmul_clark(points, at):
     points = np.asarray(points)
 
     while len(points) < len(at):
@@ -48,6 +48,6 @@ def CatmulClark(points, at):
 
 
 curve_method = {
-    "Bezier": Bezier,
-    "CatmulClark": CatmulClark,
+    "Bezier": bezier,
+    "CatmulClark": catmul_clark,
 }

viscm/cli.py

@@ -92,9 +92,9 @@ def cli():
         if cm is None:
             sys.exit("Please specify a colormap")
         fig = plt.figure()
-        figureCanvas = gui.FigureCanvas(fig)
+        figure_canvas = gui.FigureCanvas(fig)
         v = gui.viscm(cm.cmap, name=cm.name, figure=fig, uniform_space=cm.uniform_space)
-        mainwindow = gui.ViewerWindow(figureCanvas, v, cm.name)
+        mainwindow = gui.ViewerWindow(figure_canvas, v, cm.name)
         if args.save is not None:
             v.figure.set_size_inches(20, 12)
             v.figure.savefig(args.save)
@@ -103,25 +103,25 @@ def cli():
             sys.exit("Sorry, I don't know how to edit the specified colormap")
         # Hold a reference so it doesn't get GC'ed
         fig = plt.figure()
-        figureCanvas = gui.FigureCanvas(fig)
+        figure_canvas = gui.FigureCanvas(fig)
         v = gui.viscm_editor(
             figure=fig,
             uniform_space=cm.uniform_space,
             cmtype=cm.cmtype,
             method=cm.method,
             **cm.params,
         )
-        mainwindow = gui.EditorWindow(figureCanvas, v)
+        mainwindow = gui.EditorWindow(figure_canvas, v)
     else:
         raise RuntimeError("can't happen")
 
     if args.quit:
         sys.exit()
 
-    figureCanvas.setSizePolicy(
+    figure_canvas.setSizePolicy(
         gui.QtWidgets.QSizePolicy.Expanding, gui.QtWidgets.QSizePolicy.Expanding
     )
-    figureCanvas.updateGeometry()
+    figure_canvas.updateGeometry()
 
     mainwindow.resize(800, 600)
     mainwindow.show()