Skip to content

Commit 1463569

Browse files
committed
Bump to Matplotlib 3.7.1
And also Cartopy to latest version to make it installable on current versions of Python.
1 parent 1affc9e commit 1463569

11 files changed

+92
-88
lines changed

Diff for: .bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.5.0
2+
current_version = 3.7.1
33

44
[bumpversion:file:./check-matplotlib-version.py]
55
search = __version__ == '{current_version}'

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ all: logos figures cheatsheets handouts docs
99

1010
.PHONY: logos
1111
logos:
12-
wget https://github.com/matplotlib/matplotlib/raw/v3.5.0/doc/_static/logo2.png -O ./logos/logo2.png
12+
wget https://github.com/matplotlib/matplotlib/raw/v3.7.1/doc/_static/logo2.png -O ./logos/logo2.png
1313

1414
.PHONY: figures
1515
figures:

Diff for: cheatsheets.tex

+4-4
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
\begin{multicols*}{5}
265265
\begin{overpic}[width=\columnwidth,tics=6,trim=12 6 18 6, clip]{logo2.png}
266266
\put (16.5,1.5) {\scriptsize\RobotoCon \textcolor[HTML]{11557c}{Cheat sheet}}
267-
\put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.5.0}}
267+
\put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.7.1}}
268268
\end{overpic}
269269
%\textbf{\Large \RobotoCon Matplotlib 3.2 cheat sheet}\\
270270
%{\ttfamily https://matplotlib.org} \hfill CC-BY 4.0
@@ -682,16 +682,16 @@
682682
\fbox{\includegraphics[width=.32\columnwidth]{style-classic.pdf}}
683683
\fbox{\includegraphics[width=.32\columnwidth]{style-grayscale.pdf}}
684684
\fbox{\includegraphics[width=.32\columnwidth]{style-ggplot.pdf}}
685-
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn.pdf}}
685+
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn-v0_8.pdf}}
686686
\fbox{\includegraphics[width=.32\columnwidth]{style-fast.pdf}}
687687
\fbox{\includegraphics[width=.32\columnwidth]{style-bmh.pdf}}
688688
\fbox{\includegraphics[width=.32\columnwidth]{style-Solarize_Light2.pdf}}
689-
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn-notebook.pdf}}
689+
\fbox{\includegraphics[width=.32\columnwidth]{style-seaborn-v0_8-notebook.pdf}}
690690
%% \fbox{\includegraphics[width=.24\columnwidth]{style-default.pdf}}
691691
%% \fbox{\includegraphics[width=.24\columnwidth]{style-classic.pdf}}
692692
%% \fbox{\includegraphics[width=.24\columnwidth]{style-grayscale.pdf}}
693693
%% \fbox{\includegraphics[width=.24\columnwidth]{style-ggplot.pdf}}
694-
%% \fbox{\includegraphics[width=.24\columnwidth]{style-seaborn.pdf}}
694+
%% \fbox{\includegraphics[width=.24\columnwidth]{style-seaborn-v0_8.pdf}}
695695
%% \fbox{\includegraphics[width=.24\columnwidth]{style-fast.pdf}}
696696
%% \fbox{\includegraphics[width=.24\columnwidth]{style-bmh.pdf}}
697697
%% \fbox{\includegraphics[width=.24\columnwidth]{style-Solarize_Light2.pdf}}

Diff for: check-matplotlib-version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
import matplotlib as mpl
33

44

5-
assert mpl.__version__ == '3.5.0'
5+
assert mpl.__version__ == '3.7.1'

Diff for: docs/conf.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
html_theme = "mpl_sphinx_theme"
3232
html_favicon = "_static/favicon.ico"
3333
html_theme_options = {
34-
"logo_link": "https://matplotlib.org/stable/",
35-
"native_site": False,
34+
"navbar_links": ("absolute", "server-stable"),
3635
}
3736
html_sidebars = {
3837
"**": []

Diff for: figures/legend.pdf

1.12 KB
Binary file not shown.

Diff for: handout-beginner.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ \subsection*{\rmfamily Save \mdseries (bitmap or vector format)}
297297
\vfill
298298
%
299299
{\scriptsize
300-
Matplotlib 3.5.0 handout for beginners.
300+
Matplotlib 3.7.1 handout for beginners.
301301
Copyright (c) 2021 Matplotlib Development Team.
302302
Released under a CC-BY 4.0 International License.
303303
Supported by NumFOCUS.

Diff for: handout-intermediate.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ \subsection*{\rmfamily Size \& DPI}
198198
\vfill
199199
%
200200
{\scriptsize
201-
Matplotlib 3.5.0 handout for intermediate users.
201+
Matplotlib 3.7.1 handout for intermediate users.
202202
Copyright (c) 2021 Matplotlib Development Team.
203203
Released under a CC-BY 4.0 International License.
204204
Supported by NumFOCUS.

Diff for: handout-tips.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ \subsection*{\rmfamily Read the documentation}
243243
\vfill
244244
%
245245
{\scriptsize
246-
Matplotlib 3.5.0 handout for tips \& tricks.
246+
Matplotlib 3.7.1 handout for tips \& tricks.
247247
Copyright (c) 2021 Matplotlib Development Team.
248248
Released under a CC-BY 4.0 International License.
249249
Supported by NumFOCUS.

Diff for: requirements/requirements.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
autopep8
22
bump2version
3-
cartopy==0.19.0.post1
3+
cartopy==0.21.1
44
flake8
5-
matplotlib==3.5.0
6-
mpl-sphinx-theme
5+
matplotlib==3.7.1
6+
mpl-sphinx-theme~=3.7.1
77
pillow>=9
88
pdfx
99
pip-tools

Diff for: requirements/requirements.txt

+78-73
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,175 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.10
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# pip-compile requirements.in
66
#
77
--no-binary shapely
88

9-
alabaster==0.7.12
9+
accessible-pygments==0.0.4
10+
# via pydata-sphinx-theme
11+
alabaster==0.7.13
1012
# via sphinx
11-
autopep8==1.6.0
13+
autopep8==2.0.2
1214
# via -r requirements.in
13-
babel==2.9.1
14-
# via sphinx
15-
beautifulsoup4==4.10.0
15+
babel==2.12.1
16+
# via
17+
# pydata-sphinx-theme
18+
# sphinx
19+
beautifulsoup4==4.12.0
1620
# via pydata-sphinx-theme
21+
build==0.10.0
22+
# via pip-tools
1723
bump2version==1.0.1
1824
# via -r requirements.in
19-
cartopy==0.19.0.post1
25+
cartopy==0.21.1
2026
# via -r requirements.in
21-
certifi==2021.10.8
22-
# via requests
23-
cffi==1.15.0
27+
certifi==2022.12.7
28+
# via
29+
# pyproj
30+
# requests
31+
cffi==1.15.1
2432
# via cryptography
2533
cfgv==3.3.1
2634
# via pre-commit
2735
chardet==4.0.0
2836
# via
2937
# pdfminer-six
3038
# pdfx
31-
charset-normalizer==2.0.12
39+
charset-normalizer==3.1.0
3240
# via requests
33-
click==8.0.4
41+
click==8.1.3
3442
# via pip-tools
35-
cryptography==36.0.1
43+
contourpy==1.0.7
44+
# via matplotlib
45+
cryptography==40.0.1
3646
# via pdfminer-six
3747
cycler==0.11.0
3848
# via matplotlib
39-
distlib==0.3.4
49+
distlib==0.3.6
4050
# via virtualenv
41-
docutils==0.17.1
51+
docutils==0.19
4252
# via
4353
# pydata-sphinx-theme
4454
# sphinx
45-
filelock==3.6.0
55+
filelock==3.10.7
4656
# via virtualenv
47-
flake8==4.0.1
57+
flake8==6.0.0
4858
# via -r requirements.in
49-
fonttools==4.29.1
59+
fonttools==4.39.2
5060
# via matplotlib
51-
identify==2.4.11
61+
identify==2.5.22
5262
# via pre-commit
53-
idna==3.3
63+
idna==3.4
5464
# via requests
55-
imagesize==1.3.0
65+
imagesize==1.4.1
5666
# via sphinx
57-
jinja2==3.0.3
67+
jinja2==3.1.2
5868
# via sphinx
59-
kiwisolver==1.3.2
69+
kiwisolver==1.4.4
6070
# via matplotlib
61-
markupsafe==2.1.0
71+
markupsafe==2.1.2
6272
# via jinja2
63-
matplotlib==3.5.0
64-
# via -r requirements.in
65-
mccabe==0.6.1
73+
matplotlib==3.7.1
74+
# via
75+
# -r requirements.in
76+
# cartopy
77+
# mpl-sphinx-theme
78+
mccabe==0.7.0
6679
# via flake8
67-
mpl-sphinx-theme==3.5.0
80+
mpl-sphinx-theme==3.7.1
6881
# via -r requirements.in
69-
nodeenv==1.6.0
82+
nodeenv==1.7.0
7083
# via pre-commit
71-
numpy==1.22.2
84+
numpy==1.24.2
7285
# via
7386
# cartopy
87+
# contourpy
7488
# matplotlib
7589
# scipy
76-
packaging==21.3
90+
# shapely
91+
packaging==23.0
7792
# via
93+
# build
7894
# matplotlib
79-
# setuptools-scm
95+
# pydata-sphinx-theme
8096
# sphinx
8197
pdfminer-six==20201018
8298
# via pdfx
8399
pdfx==1.4.1
84100
# via -r requirements.in
85-
pep517==0.12.0
86-
# via pip-tools
87-
pillow==9.0.1
101+
pillow==9.4.0
88102
# via
89103
# -r requirements.in
90104
# matplotlib
91-
pip-tools==6.5.1
105+
pip-tools==6.12.3
92106
# via -r requirements.in
93-
platformdirs==2.5.1
107+
platformdirs==3.2.0
94108
# via virtualenv
95-
pre-commit==2.17.0
109+
pre-commit==3.2.1
96110
# via -r requirements.in
97-
pycodestyle==2.8.0
111+
pycodestyle==2.10.0
98112
# via
99113
# autopep8
100114
# flake8
101115
pycparser==2.21
102116
# via cffi
103-
pydata-sphinx-theme==0.8.0
117+
pydata-sphinx-theme==0.13.1
104118
# via mpl-sphinx-theme
105-
pyflakes==2.4.0
119+
pyflakes==3.0.1
106120
# via flake8
107-
pygments==2.11.2
108-
# via sphinx
109-
pyparsing==3.0.7
121+
pygments==2.14.0
110122
# via
111-
# matplotlib
112-
# packaging
113-
pyshp==2.2.0
123+
# accessible-pygments
124+
# pydata-sphinx-theme
125+
# sphinx
126+
pyparsing==3.0.9
127+
# via matplotlib
128+
pyproj==3.4.1
129+
# via cartopy
130+
pyproject-hooks==1.0.0
131+
# via build
132+
pyshp==2.3.1
114133
# via cartopy
115134
python-dateutil==2.8.2
116135
# via matplotlib
117-
pytz==2021.3
118-
# via babel
119136
pyyaml==6.0
120137
# via pre-commit
121-
requests==2.27.1
138+
requests==2.28.2
122139
# via sphinx
123-
scipy==1.8.0
140+
scipy==1.10.1
124141
# via -r requirements.in
125-
setuptools-scm==6.4.2
126-
# via matplotlib
127-
shapely==1.8.1.post1
142+
shapely==2.0.1
128143
# via cartopy
129144
six==1.16.0
130-
# via
131-
# python-dateutil
132-
# virtualenv
145+
# via python-dateutil
133146
snowballstemmer==2.2.0
134147
# via sphinx
135148
sortedcontainers==2.4.0
136149
# via pdfminer-six
137-
soupsieve==2.3.1
150+
soupsieve==2.4
138151
# via beautifulsoup4
139-
sphinx==4.4.0
152+
sphinx==6.1.3
140153
# via
141154
# -r requirements.in
142155
# pydata-sphinx-theme
143-
sphinxcontrib-applehelp==1.0.2
156+
sphinxcontrib-applehelp==1.0.4
144157
# via sphinx
145158
sphinxcontrib-devhelp==1.0.2
146159
# via sphinx
147-
sphinxcontrib-htmlhelp==2.0.0
160+
sphinxcontrib-htmlhelp==2.0.1
148161
# via sphinx
149162
sphinxcontrib-jsmath==1.0.1
150163
# via sphinx
151164
sphinxcontrib-qthelp==1.0.3
152165
# via sphinx
153166
sphinxcontrib-serializinghtml==1.1.5
154167
# via sphinx
155-
toml==0.10.2
156-
# via
157-
# autopep8
158-
# pre-commit
159-
tomli==2.0.1
160-
# via
161-
# pep517
162-
# setuptools-scm
163-
urllib3==1.26.8
168+
urllib3==1.26.15
164169
# via requests
165-
virtualenv==20.13.1
170+
virtualenv==20.21.0
166171
# via pre-commit
167-
wheel==0.37.1
172+
wheel==0.40.0
168173
# via pip-tools
169174

170175
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)