Merge pull request #96 from jimustafa/pep8

apply PEP-8 throughout the codebase

Author: rougier

Diff for: .flake8

@@ -0,0 +1,5 @@
+[flake8]
+ignore = E20,E22,E501,E701,F401,W
+
+[pep8]
+select = E12,E231,E241,E251,E26,E30

Diff for: .pre-commit-config.yaml

@@ -9,3 +9,7 @@ repos:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8

Diff for: docs/conf.py

@@ -5,8 +5,8 @@
 html_title = 'Visualization with Python'
 project = "Matplotlib cheatsheets"
 copyright = (
-     f"2012 - {datetime.datetime.now().year} The Matplotlib development team"
- )
+    f"2012 - {datetime.datetime.now().year} The Matplotlib development team"
+)
 author = "Matplotlib Developers"
 
 # -- General configuration ---------------------------------------------------

Diff for: logos/mpl-logos2.py

@@ -155,6 +155,7 @@ def make_logo(height_px, lw_bars, lw_grid, lw_border, rgrid, with_text=False):
 
     return fig, ax
 
+
 ##############################################################################
 # A large logo:
 

Diff for: requirements/requirements.in

@@ -1,11 +1,13 @@
+autopep8
 bump2version
 cartopy==0.19.0.post1
+flake8
 matplotlib==3.4.2
+mpl-sphinx-theme
 pdfx
 pip-tools
 pre-commit
 scipy
 sphinx
-mpl-sphinx-theme
 
 --no-binary shapely

Diff for: requirements/requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile requirements.in
@@ -10,6 +10,8 @@ alabaster==0.7.12
     # via sphinx
 appdirs==1.4.4
     # via virtualenv
+autopep8==1.6.0
+    # via -r requirements.in
 babel==2.9.1
     # via sphinx
 beautifulsoup4==4.9.3
@@ -44,12 +46,20 @@ docutils==0.17.1
     #   sphinx
 filelock==3.0.12
     # via virtualenv
+flake8==4.0.1
+    # via -r requirements.in
 identify==2.2.2
     # via pre-commit
 idna==3.3
     # via requests
 imagesize==1.2.0
     # via sphinx
+importlib-metadata==4.2.0
+    # via
+    #   flake8
+    #   pep517
+    #   pre-commit
+    #   virtualenv
 jinja2==3.0.2
     # via sphinx
 kiwisolver==1.3.1
@@ -58,6 +68,8 @@ markupsafe==2.0.1
     # via jinja2
 matplotlib==3.4.2
     # via -r requirements.in
+mccabe==0.6.1
+    # via flake8
 mpl-sphinx-theme==0.0.6
     # via -r requirements.in
 nodeenv==1.5.0
@@ -81,10 +93,16 @@ pip-tools==6.1.0
     # via -r requirements.in
 pre-commit==2.11.1
     # via -r requirements.in
+pycodestyle==2.8.0
+    # via
+    #   autopep8
+    #   flake8
 pycparser==2.20
     # via cffi
 pydata-sphinx-theme==0.7.1
     # via mpl-sphinx-theme
+pyflakes==2.4.0
+    # via flake8
 pygments==2.10.0
     # via sphinx
 pyparsing==2.4.7
@@ -134,12 +152,19 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 toml==0.10.2
     # via
+    #   autopep8
     #   pep517
     #   pre-commit
+typing-extensions==4.0.0
+    # via importlib-metadata
 urllib3==1.26.7
     # via requests
 virtualenv==20.4.3
     # via pre-commit
+zipp==3.6.0
+    # via
+    #   importlib-metadata
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

Diff for: scripts/adjustements.py

@@ -10,39 +10,39 @@
 
 
 fig = plt.figure(figsize=(4.25, 4.25 * 95/115))
-ax = fig.add_axes([0,0,1,1], frameon=False, aspect=1,
-                  xlim=(0-5,100+10), ylim=(-10,80+5), xticks=[], yticks=[])
+ax = fig.add_axes([0, 0, 1, 1], frameon=False, aspect=1,
+                  xlim=(0-5, 100+10), ylim=(-10, 80+5), xticks=[], yticks=[])
 
 
 box = mpatches.FancyBboxPatch(
-    (0,0), 100, 83,  mpatches.BoxStyle("Round", pad=0, rounding_size=2),
+    (0, 0), 100, 83, mpatches.BoxStyle("Round", pad=0, rounding_size=2),
     linewidth=1., facecolor="0.9", edgecolor="black")
 ax.add_artist(box)
 
 box = mpatches.FancyBboxPatch(
-    (0,0), 100, 75, mpatches.BoxStyle("Round", pad=0, rounding_size=0),
+    (0, 0), 100, 75, mpatches.BoxStyle("Round", pad=0, rounding_size=0),
     linewidth=1., facecolor="white", edgecolor="black")
 ax.add_artist(box)
 
 
 box = mpatches.Rectangle(
-    (5,5), 45, 30, zorder=10,
+    (5, 5), 45, 30, zorder=10,
     linewidth=1.0, facecolor="white", edgecolor="black")
 ax.add_artist(box)
 
 box = mpatches.Rectangle(
-    (5,40), 45, 30, zorder=10,
+    (5, 40), 45, 30, zorder=10,
     linewidth=1.0, facecolor="white", edgecolor="black")
 ax.add_artist(box)
 
 box = mpatches.Rectangle(
-    (55,5), 40, 65, zorder=10,
+    (55, 5), 40, 65, zorder=10,
     linewidth=1.0, facecolor="white", edgecolor="black")
 ax.add_artist(box)
 
 # Window button
-X, Y = [5,10,15], [79,79,79]
-plt.scatter(X, Y, s=75,  zorder=10,
+X, Y = [5, 10, 15], [79, 79, 79]
+plt.scatter(X, Y, s=75, zorder=10,
             edgecolor="black", facecolor="white", linewidth=1)
 
 
@@ -60,7 +60,7 @@
 plt.plot(X, Y, color="black", linestyle=":", linewidth=1, clip_on=False)
 
 
-def ext_arrow(p0,p1,p2,p3):
+def ext_arrow(p0, p1, p2, p3):
     p0, p1 = np.asarray(p0), np.asarray(p1)
     p2, p3 = np.asarray(p2), np.asarray(p3)
     ax.arrow(*p0, *(p1-p0), zorder=20, linewidth=0,
@@ -69,9 +69,10 @@ def ext_arrow(p0,p1,p2,p3):
     ax.arrow(*p3, *(p2-p3), zorder=20, linewidth=0,
              length_includes_head=True, width=.4,
              head_width=2, head_length=2, color="black")
-    plt.plot([p1[0],p2[0]], [p1[1],p2[1]], linewidth=.9, color="black")
+    plt.plot([p1[0], p2[0]], [p1[1], p2[1]], linewidth=.9, color="black")
 
-def int_arrow(p0,p1):
+
+def int_arrow(p0, p1):
     p0, p1 = np.asarray(p0), np.asarray(p1)
     ax.arrow(*((p0+p1)/2), *((p1-p0)/2), zorder=20, linewidth=0,
              length_includes_head=True, width=.4,
@@ -81,48 +82,47 @@ def int_arrow(p0,p1):
              head_width=2, head_length=2, color="black")
 
 
-
 x = 0
 y = 10
-ext_arrow( (x-4,y), (x,y), (x+5,y), (x+9,y) )
+ext_arrow( (x-4, y), (x, y), (x+5, y), (x+9, y) )
 ax.text(x+9.5, y, "left", ha="left", va="center", size="x-small", zorder=20)
 
 x += 50
-ext_arrow( (x-4,y), (x,y), (x+5,y), (x+9,y) )
+ext_arrow( (x-4, y), (x, y), (x+5, y), (x+9, y) )
 ax.text(x-4.5, y, "wspace", ha="right", va="center", size="x-small", zorder=20)
 
 x += 45
-ext_arrow( (x-4,y), (x,y), (x+5,y), (x+9,y) )
+ext_arrow( (x-4, y), (x, y), (x+5, y), (x+9, y) )
 ax.text(x-4.5, y, "right", ha="right", va="center", size="x-small", zorder=20)
 
 y = 0
 x = 25
-ext_arrow( (x,y-4), (x,y), (x,y+5), (x,y+9) )
+ext_arrow( (x, y-4), (x, y), (x, y+5), (x, y+9) )
 ax.text(x, y+9.5, "bottom", ha="center", va="bottom", size="x-small", zorder=20)
 
 y += 35
-ext_arrow( (x,y-4), (x,y), (x,y+5), (x,y+9) )
+ext_arrow( (x, y-4), (x, y), (x, y+5), (x, y+9) )
 ax.text(x, y-4.5, "hspace", ha="center", va="top", size="x-small", zorder=20)
 
 y += 35
-ext_arrow( (x,y-4), (x,y), (x,y+5), (x,y+9) )
+ext_arrow( (x, y-4), (x, y), (x, y+5), (x, y+9) )
 ax.text(x, y-4.5, "top", ha="center", va="top", size="x-small", zorder=20)
 
-int_arrow((0,-5), (100,-5))
+int_arrow((0, -5), (100, -5))
 ax.text(50, -5, "figure width", backgroundcolor="white", zorder=30,
         ha="center", va="center", size="x-small")
 
-int_arrow((105,0), (105,75))
+int_arrow((105, 0), (105, 75))
 ax.text(105, 75/2, "figure height", backgroundcolor="white", zorder=30,
-        rotation = "vertical", ha="center", va="center", size="x-small")
+        rotation="vertical", ha="center", va="center", size="x-small")
 
-int_arrow((55,62.5), (95,62.5))
+int_arrow((55, 62.5), (95, 62.5))
 ax.text(75, 62.5, "axes width", backgroundcolor="white", zorder=30,
         ha="center", va="center", size="x-small")
 
-int_arrow((62.5,5), (62.5,70))
+int_arrow((62.5, 5), (62.5, 70))
 ax.text(62.5, 35, "axes height", backgroundcolor="white", zorder=30,
-        rotation = "vertical", ha="center", va="center", size="x-small")
+        rotation="vertical", ha="center", va="center", size="x-small")
 
 
 plt.savefig("../figures/adjustments.pdf")

Diff for: scripts/anatomy.py

@@ -23,6 +23,7 @@ def minor_tick(x, pos):
         return ""
     return "%.2f" % x
 
+
 ax.xaxis.set_major_locator(MultipleLocator(1.000))
 ax.xaxis.set_minor_locator(AutoMinorLocator(4))
 ax.yaxis.set_major_locator(MultipleLocator(1.000))
@@ -124,13 +125,13 @@ def text(x, y, text):
 
 color = '#000099'
 ax.annotate('Spines', xy=(4.0, 0.35), xytext=(3.3, 0.5), color=color,
-            weight='regular', # fontsize="large", fontname="Yanone Kaffeesatz",
+            weight='regular',  # fontsize="large", fontname="Yanone Kaffeesatz",
             arrowprops=dict(arrowstyle='->',
                             connectionstyle="arc3",
                             color=color))
 
 ax.annotate('', xy=(3.15, 0.0), xytext=(3.45, 0.45), color=color,
-            weight='regular', # fontsize="large", fontname="Yanone Kaffeesatz",
+            weight='regular',  # fontsize="large", fontname="Yanone Kaffeesatz",
             arrowprops=dict(arrowstyle='->',
                             connectionstyle="arc3",
                             color=color))

Diff for: scripts/animation.py

@@ -2,11 +2,15 @@
 import matplotlib.pyplot as plt
 import matplotlib.animation as animation
 
-T = np.linspace(0,2*np.pi,100)
+T = np.linspace(0, 2*np.pi, 100)
 S = np.sin(T)
 line, = plt.plot(T, S)
+
+
 def animate(i):
     line.set_ydata(np.sin(T+i/50))
+
+
 a=animation.FuncAnimation(
     plt.gcf(), animate, interval=5)
 # plt.show()

Diff for: scripts/annotate.py

@@ -7,18 +7,17 @@
 import matplotlib.pyplot as plt
 
 
-fig = plt.figure(figsize=(6,1))
-#ax = plt.subplot(111, frameon=False, aspect=.1)
+fig = plt.figure(figsize=(6, 1))
+# ax = plt.subplot(111, frameon=False, aspect=.1)
 # b = 0.0
-ax = fig.add_axes([0,0,1,1], frameon=False, aspect=1)
+ax = fig.add_axes([0, 0, 1, 1], frameon=False, aspect=1)
 
 
-
-plt.scatter([5.5],[0.75], s=100, c="k")
-plt.xlim(0,6), plt.ylim(0,1)
+plt.scatter([5.5], [0.75], s=100, c="k")
+plt.xlim(0, 6), plt.ylim(0, 1)
 plt.xticks([]), plt.yticks([])
 
-plt.annotate("Annotation", (5.5,.75), (0.1,.75), size=16, va="center",
+plt.annotate("Annotation", (5.5, .75), (0.1, .75), size=16, va="center",
              arrowprops=dict(facecolor='black', shrink=0.05))
 
 plt.text( 5.5, 0.6, "xy\nycoords", size=10, va="top", ha="center", color=".5")

Diff for: scripts/annotation-arrow-styles.py

@@ -2,15 +2,18 @@
 import matplotlib.patches as mpatches
 
 styles = mpatches.ArrowStyle.get_styles()
+
+
 def demo_con_style(ax, connectionstyle):
     ax.text(.05, .95, connectionstyle.replace(",", ",\n"),
             family="Source Code Pro",
             transform=ax.transAxes, ha="left", va="top", size="x-small")
 
+
 (fig, axes) = plt.subplots(5, 3, figsize=(4, 2.5), frameon=False)
 for ax in axes.flatten():
     ax.axis("off")
-for i,(ax,style) in enumerate(zip(axes.flatten(), mpatches.ArrowStyle.get_styles())):
+for i, (ax, style) in enumerate(zip(axes.flatten(), mpatches.ArrowStyle.get_styles())):
     x0, y0 = 0.8, 0.5
     x1, y1 = 0.2, 0.5
     ax.plot([x0, x1], [y0, y1], ".", color="0.25")
@@ -24,7 +27,7 @@ def demo_con_style(ax, connectionstyle):
                                 connectionstyle="arc3,rad=0"))
     ax.text( (x1+x0)/2, y0-0.2, style,
              transform=ax.transAxes,
-             family = "Source Code Pro", ha="center", va="top")
+             family="Source Code Pro", ha="center", va="top")
 
 plt.savefig("../figures/annotation-arrow-styles.pdf")
 # plt.show()

Diff for: scripts/annotation-connection-styles.py

@@ -1,5 +1,6 @@
 import matplotlib.pyplot as plt
 
+
 def demo_con_style(ax, connectionstyle):
     x1, y1 = 0.3, 0.2
     x2, y2 = 0.8, 0.6
@@ -16,6 +17,7 @@ def demo_con_style(ax, connectionstyle):
             family="Source Code Pro",
             transform=ax.transAxes, ha="left", va="top", size="x-small")
 
+
 fig, axs = plt.subplots(3, 3, figsize=(5, 5))
 demo_con_style(axs[0, 0], "arc3,rad=0")
 demo_con_style(axs[0, 1], "arc3,rad=0.3")

Diff for: scripts/basic-plots.py

@@ -68,10 +68,10 @@
 # Basic imshow plot
 # -----------------------------------------------------------------------------
 np.random.seed(3)
-I = np.zeros((8, 8, 4))
-I[:,:] = mpl.colors.to_rgba("C1")
-I[...,3] = np.random.uniform(0.25, 1.0, (8, 8))
-ax.imshow(I, extent=[0, 8, 0, 8], interpolation="nearest")
+Z = np.zeros((8, 8, 4))
+Z[:, :] = mpl.colors.to_rgba("C1")
+Z[..., 3] = np.random.uniform(0.25, 1.0, (8, 8))
+ax.imshow(Z, extent=[0, 8, 0, 8], interpolation="nearest")
 ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
 ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
 ax.grid(linewidth=0.25, color="white")