From 8bf9963dd4648c2a86c1380c6499f912a37bc8be Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 3 Feb 2024 11:12:09 +0000 Subject: [PATCH 1/2] Update Matplotlib version to 3.8 --- .bumpversion.cfg | 2 +- Makefile | 2 +- cheatsheets.tex | 2 +- check-matplotlib-version.py | 2 +- handout-beginner.tex | 2 +- handout-intermediate.tex | 2 +- handout-tips.tex | 2 +- requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 776285c..7e284e4 100644 --- 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 index b7e8177..7c59d96 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ 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 + wget https://github.com/matplotlib/matplotlib/raw/v3.8.2/doc/_static/logo2.png -O ./logos/logo2.png .PHONY: figures figures: diff --git a/cheatsheets.tex b/cheatsheets.tex index f7462c7..2b67348 100644 --- 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 index 18b903f..1430429 100755 --- 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 index da99d28..b9e3cbf 100644 --- 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 index 7a6b679..c30c2cc 100644 --- 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 index 3e5e261..5d80176 100644 --- 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 index f36a79f..d3d18dd 100644 --- 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 mpl-sphinx-theme~=3.7.1 pillow>=9 pdfx diff --git a/requirements/requirements.txt b/requirements/requirements.txt index ea4ee51..6474dea 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -70,7 +70,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 From 593853aa22ae3458d6bdf054e94bdb42292cb129 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 3 Feb 2024 11:19:12 +0000 Subject: [PATCH 2/2] Remove make logos option --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7c59d96..da87bf8 100644 --- 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.8.2/doc/_static/logo2.png -O ./logos/logo2.png +all: figures cheatsheets handouts docs .PHONY: figures figures: