Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Matplotlib to 3.6 #145

Merged
merged 2 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.5.0
current_version = 3.6.3

[bumpversion:file:./check-matplotlib-version.py]
search = __version__ == '{current_version}'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ all: logos figures cheatsheets handouts docs

.PHONY: logos
logos:
wget https://github.com/matplotlib/matplotlib/raw/v3.5.0/doc/_static/logo2.png -O ./logos/logo2.png
wget https://github.com/matplotlib/matplotlib/raw/v3.6.3/doc/_static/logo2.png -O ./logos/logo2.png

.PHONY: figures
figures:
Expand Down
14 changes: 3 additions & 11 deletions cheatsheets.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0}}
\put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.6.3}}
\end{overpic}
%\textbf{\Large \RobotoCon Matplotlib 3.2 cheat sheet}\\
%{\ttfamily https://matplotlib.org} \hfill CC-BY 4.0
Expand Down Expand Up @@ -682,19 +682,11 @@
\fbox{\includegraphics[width=.32\columnwidth]{style-classic.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-grayscale.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-ggplot.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn-v0_8.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-fast.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-bmh.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-Solarize_Light2.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn-notebook.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-default.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-classic.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-grayscale.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-ggplot.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-seaborn.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-fast.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-bmh.pdf}}
%% \fbox{\includegraphics[width=.24\columnwidth]{style-Solarize_Light2.pdf}}
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn-v0_8-notebook.pdf}}
\end{myboxed}
%
\vspace{\fill}
Expand Down
2 changes: 1 addition & 1 deletion check-matplotlib-version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
import matplotlib as mpl


assert mpl.__version__ == '3.5.0'
assert mpl.__version__ == '3.6.3'
2 changes: 1 addition & 1 deletion handout-beginner.tex
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ \subsection*{\rmfamily Save \mdseries (bitmap or vector format)}
\vfill
%
{\scriptsize
Matplotlib 3.5.0 handout for beginners.
Matplotlib 3.6.3 handout for beginners.
Copyright (c) 2021 Matplotlib Development Team.
Released under a CC-BY 4.0 International License.
Supported by NumFOCUS.
Expand Down
2 changes: 1 addition & 1 deletion handout-intermediate.tex
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ \subsection*{\rmfamily Size \& DPI}
\vfill
%
{\scriptsize
Matplotlib 3.5.0 handout for intermediate users.
Matplotlib 3.6.3 handout for intermediate users.
Copyright (c) 2021 Matplotlib Development Team.
Released under a CC-BY 4.0 International License.
Supported by NumFOCUS.
Expand Down
2 changes: 1 addition & 1 deletion handout-tips.tex
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ \subsection*{\rmfamily Read the documentation}
\vfill
%
{\scriptsize
Matplotlib 3.5.0 handout for tips \& tricks.
Matplotlib 3.6.3 handout for tips \& tricks.
Copyright (c) 2021 Matplotlib Development Team.
Released under a CC-BY 4.0 International License.
Supported by NumFOCUS.
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ autopep8
bump2version
cartopy==0.22.0
flake8
matplotlib==3.5.0
matplotlib==3.6.3
mpl-sphinx-theme
pillow>=9
pdfx
Expand Down
12 changes: 5 additions & 7 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ charset-normalizer==2.0.12
# via requests
click==8.0.4
# via pip-tools
contourpy==1.2.0
# via matplotlib
cryptography==36.0.1
# via pdfminer-six
cycler==0.11.0
Expand Down Expand Up @@ -62,7 +64,7 @@ kiwisolver==1.3.2
# via matplotlib
markupsafe==2.1.0
# via jinja2
matplotlib==3.5.0
matplotlib==3.6.3
# via
# -r requirements.in
# cartopy
Expand All @@ -75,13 +77,13 @@ nodeenv==1.6.0
numpy==1.22.2
# via
# cartopy
# contourpy
# matplotlib
# scipy
packaging==21.3
# via
# cartopy
# matplotlib
# setuptools-scm
# sphinx
pdfminer-six==20201018
# via pdfx
Expand Down Expand Up @@ -129,8 +131,6 @@ requests==2.27.1
# via sphinx
scipy==1.8.0
# via -r requirements.in
setuptools-scm==6.4.2
# via matplotlib
shapely==1.8.1.post1
# via cartopy
six==1.16.0
Expand Down Expand Up @@ -164,9 +164,7 @@ toml==0.10.2
# autopep8
# pre-commit
tomli==2.0.1
# via
# pep517
# setuptools-scm
# via pep517
urllib3==1.26.8
# via requests
virtualenv==20.13.1
Expand Down
Loading