Merge pull request #146 from dstansby/mpl38

Update Matplotlib version to 3.8

Author: dstansby

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.7.4
+current_version = 3.8.2
 
 [bumpversion:file:./check-matplotlib-version.py]
 search = __version__ == '{current_version}'

Makefile

@@ -5,11 +5,7 @@ CONVERTFLAGS = -density 150 -alpha remove -depth 8
 default: all
 
 .PHONY: all
-all: logos figures cheatsheets handouts docs
-
-.PHONY: logos
-logos:
-	wget https://github.com/matplotlib/matplotlib/raw/v3.7.4/doc/_static/logo2.png -O ./logos/logo2.png
+all: figures cheatsheets handouts docs
 
 .PHONY: figures
 figures:

cheatsheets.tex

@@ -264,7 +264,7 @@
 \begin{multicols*}{5}
   \begin{overpic}[width=\columnwidth,tics=6,trim=12 6 18 6, clip]{logo2.png}
     \put (16.5,1.5) {\scriptsize\RobotoCon \textcolor[HTML]{11557c}{Cheat sheet}}
-    \put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.7.4}}
+    \put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.8.2}}
    \end{overpic}
   %\textbf{\Large \RobotoCon Matplotlib 3.2 cheat sheet}\\
   %{\ttfamily https://matplotlib.org} \hfill CC-BY 4.0

check-matplotlib-version.py

@@ -2,4 +2,4 @@
 import matplotlib as mpl
 
 
-assert mpl.__version__ == '3.7.4'
+assert mpl.__version__ == '3.8.2'

handout-beginner.tex

@@ -297,7 +297,7 @@ \subsection*{\rmfamily Save \mdseries (bitmap or vector format)}
 \vfill
 %
 {\scriptsize
-  Matplotlib 3.7.4 handout for beginners.
+  Matplotlib 3.8.2 handout for beginners.
   Copyright (c) 2021 Matplotlib Development Team.
   Released under a CC-BY 4.0 International License.
   Supported by NumFOCUS.

handout-intermediate.tex

@@ -198,7 +198,7 @@ \subsection*{\rmfamily Size \& DPI}
 \vfill
 %
 {\scriptsize
-  Matplotlib 3.7.4 handout for intermediate users.
+  Matplotlib 3.8.2 handout for intermediate users.
   Copyright (c) 2021 Matplotlib Development Team.
   Released under a CC-BY 4.0 International License.
   Supported by NumFOCUS.

handout-tips.tex

@@ -243,7 +243,7 @@ \subsection*{\rmfamily Read the documentation}
 \vfill
 %
 {\scriptsize
-  Matplotlib 3.7.4 handout for tips \& tricks.
+  Matplotlib 3.8.2 handout for tips \& tricks.
   Copyright (c) 2021 Matplotlib Development Team.
   Released under a CC-BY 4.0 International License.
   Supported by NumFOCUS.

requirements/requirements.in

@@ -2,7 +2,7 @@ autopep8
 bump2version
 cartopy==0.22.0
 flake8
-matplotlib==3.7.4
+matplotlib==3.8.2
 pillow>=9
 pdfx
 pip-tools

requirements/requirements.txt

@@ -68,7 +68,7 @@ kiwisolver==1.4.5
     # via matplotlib
 markupsafe==2.1.4
     # via jinja2
-matplotlib==3.7.4
+matplotlib==3.8.2
     # via
     #   -r requirements.in
     #   cartopy

scripts/markers.py

@@ -27,7 +27,6 @@
     ".", "o", "s", "P", "X", "*", "p", "D", "<", ">", "^", "v", ]
 for x, y, marker in zip(X, Y, markers):
     if y == 3: fc = "white"
-    elif y == 2: fc = "None"
     else: fc = "C1"
     plt.scatter(x, 1+y, s=100, marker=marker, fc=fc, ec="C1", lw=0.5)