Merge pull request #146 from dstansby/mpl38

dstansby · web-flow · commit f02ebb5f02ab · 2025-05-12T20:05:34.000+01:00
Update Matplotlib version to 3.8
diff --git a/.bumpversion.cfg b/.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}'
diff --git a/Makefile b/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:
diff --git a/cheatsheets.tex b/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
diff --git a/check-matplotlib-version.py b/check-matplotlib-version.py
@@ -2,4 +2,4 @@
 import matplotlib as mpl
 
 
-assert mpl.__version__ == '3.7.4'
+assert mpl.__version__ == '3.8.2'
diff --git a/handout-beginner.tex b/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.
diff --git a/handout-intermediate.tex b/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.
diff --git a/handout-tips.tex b/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.
diff --git a/requirements/requirements.in b/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
diff --git a/requirements/requirements.txt b/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
diff --git a/scripts/markers.py b/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)
 

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`	`import matplotlib as mpl`
`3`	`3`
`4`	`4`
`5`		`-assert mpl.__version__ == '3.7.4'`
	`5`	`+assert mpl.__version__ == '3.8.2'`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ \subsection*{\rmfamily Save \mdseries (bitmap or vector format)}`
`297`	`297`	`\vfill`
`298`	`298`	`%`
`299`	`299`	`{\scriptsize`
`300`		`- Matplotlib 3.7.4 handout for beginners.`
	`300`	`+ Matplotlib 3.8.2 handout for beginners.`
`301`	`301`	`Copyright (c) 2021 Matplotlib Development Team.`
`302`	`302`	`Released under a CC-BY 4.0 International License.`
`303`	`303`	`Supported by NumFOCUS.`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ \subsection*{\rmfamily Size \& DPI}`
`198`	`198`	`\vfill`
`199`	`199`	`%`
`200`	`200`	`{\scriptsize`
`201`		`- Matplotlib 3.7.4 handout for intermediate users.`
	`201`	`+ Matplotlib 3.8.2 handout for intermediate users.`
`202`	`202`	`Copyright (c) 2021 Matplotlib Development Team.`
`203`	`203`	`Released under a CC-BY 4.0 International License.`
`204`	`204`	`Supported by NumFOCUS.`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ \subsection*{\rmfamily Read the documentation}`
`243`	`243`	`\vfill`
`244`	`244`	`%`
`245`	`245`	`{\scriptsize`
`246`		`- Matplotlib 3.7.4 handout for tips \& tricks.`
	`246`	`+ Matplotlib 3.8.2 handout for tips \& tricks.`
`247`	`247`	`Copyright (c) 2021 Matplotlib Development Team.`
`248`	`248`	`Released under a CC-BY 4.0 International License.`
`249`	`249`	`Supported by NumFOCUS.`