Merge branch 'mpl37' into custom-font

Author: QuLogic

.bumpversion.cfg

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

Makefile

@@ -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.7.1/doc/_static/logo2.png -O ./logos/logo2.png
 
 .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.5.0}}
+    \put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.7.1}}
    \end{overpic}
   %\textbf{\Large \RobotoCon Matplotlib 3.2 cheat sheet}\\
   %{\ttfamily https://matplotlib.org} \hfill CC-BY 4.0
@@ -682,16 +682,16 @@
     \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=.32\columnwidth]{style-seaborn-v0_8-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-seaborn-v0_8.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}}

check-matplotlib-version.py

@@ -2,4 +2,4 @@
 import matplotlib as mpl
 
 
-assert mpl.__version__ == '3.5.0'
+assert mpl.__version__ == '3.7.1'

docs/conf.py

@@ -31,8 +31,7 @@
 html_theme = "mpl_sphinx_theme"
 html_favicon = "_static/favicon.ico"
 html_theme_options = {
-    "logo_link": "https://matplotlib.org/stable/",
-    "native_site": False,
+    "navbar_links": ("absolute", "server-stable"),
 }
 html_sidebars = {
     "**": []

handout-beginner.tex

@@ -297,7 +297,7 @@ \subsection*{\rmfamily Save \mdseries (bitmap or vector format)}
 \vfill
 %
 {\scriptsize
-  Matplotlib 3.5.0 handout for beginners.
+  Matplotlib 3.7.1 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.5.0 handout for intermediate users.
+  Matplotlib 3.7.1 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.5.0 handout for tips \& tricks.
+  Matplotlib 3.7.1 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

@@ -1,9 +1,9 @@
 autopep8
 bump2version
-cartopy==0.19.0.post1
+cartopy==0.21.1
 flake8
-matplotlib==3.5.0
-mpl-sphinx-theme
+matplotlib==3.7.1
+mpl-sphinx-theme~=3.7.1
 pillow>=9
 pdfx
 pip-tools

requirements/requirements.txt

@@ -1,170 +1,175 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile requirements.in
 #
 --no-binary shapely
 
-alabaster==0.7.12
+accessible-pygments==0.0.4
+    # via pydata-sphinx-theme
+alabaster==0.7.13
     # via sphinx
-autopep8==1.6.0
+autopep8==2.0.2
     # via -r requirements.in
-babel==2.9.1
-    # via sphinx
-beautifulsoup4==4.10.0
+babel==2.12.1
+    # via
+    #   pydata-sphinx-theme
+    #   sphinx
+beautifulsoup4==4.12.0
     # via pydata-sphinx-theme
+build==0.10.0
+    # via pip-tools
 bump2version==1.0.1
     # via -r requirements.in
-cartopy==0.19.0.post1
+cartopy==0.21.1
     # via -r requirements.in
-certifi==2021.10.8
-    # via requests
-cffi==1.15.0
+certifi==2022.12.7
+    # via
+    #   pyproj
+    #   requests
+cffi==1.15.1
     # via cryptography
 cfgv==3.3.1
     # via pre-commit
 chardet==4.0.0
     # via
     #   pdfminer-six
     #   pdfx
-charset-normalizer==2.0.12
+charset-normalizer==3.1.0
     # via requests
-click==8.0.4
+click==8.1.3
     # via pip-tools
-cryptography==36.0.1
+contourpy==1.0.7
+    # via matplotlib
+cryptography==40.0.1
     # via pdfminer-six
 cycler==0.11.0
     # via matplotlib
-distlib==0.3.4
+distlib==0.3.6
     # via virtualenv
-docutils==0.17.1
+docutils==0.19
     # via
     #   pydata-sphinx-theme
     #   sphinx
-filelock==3.6.0
+filelock==3.10.7
     # via virtualenv
-flake8==4.0.1
+flake8==6.0.0
     # via -r requirements.in
-fonttools==4.29.1
+fonttools==4.39.2
     # via matplotlib
-identify==2.4.11
+identify==2.5.22
     # via pre-commit
-idna==3.3
+idna==3.4
     # via requests
-imagesize==1.3.0
+imagesize==1.4.1
     # via sphinx
-jinja2==3.0.3
+jinja2==3.1.2
     # via sphinx
-kiwisolver==1.3.2
+kiwisolver==1.4.4
     # via matplotlib
-markupsafe==2.1.0
+markupsafe==2.1.2
     # via jinja2
-matplotlib==3.5.0
-    # via -r requirements.in
-mccabe==0.6.1
+matplotlib==3.7.1
+    # via
+    #   -r requirements.in
+    #   cartopy
+    #   mpl-sphinx-theme
+mccabe==0.7.0
     # via flake8
-mpl-sphinx-theme==3.5.0
+mpl-sphinx-theme==3.7.1
     # via -r requirements.in
-nodeenv==1.6.0
+nodeenv==1.7.0
     # via pre-commit
-numpy==1.22.2
+numpy==1.24.2
     # via
     #   cartopy
+    #   contourpy
     #   matplotlib
     #   scipy
-packaging==21.3
+    #   shapely
+packaging==23.0
     # via
+    #   build
     #   matplotlib
-    #   setuptools-scm
+    #   pydata-sphinx-theme
     #   sphinx
 pdfminer-six==20201018
     # via pdfx
 pdfx==1.4.1
     # via -r requirements.in
-pep517==0.12.0
-    # via pip-tools
-pillow==9.0.1
+pillow==9.4.0
     # via
     #   -r requirements.in
     #   matplotlib
-pip-tools==6.5.1
+pip-tools==6.12.3
     # via -r requirements.in
-platformdirs==2.5.1
+platformdirs==3.2.0
     # via virtualenv
-pre-commit==2.17.0
+pre-commit==3.2.1
     # via -r requirements.in
-pycodestyle==2.8.0
+pycodestyle==2.10.0
     # via
     #   autopep8
     #   flake8
 pycparser==2.21
     # via cffi
-pydata-sphinx-theme==0.8.0
+pydata-sphinx-theme==0.13.1
     # via mpl-sphinx-theme
-pyflakes==2.4.0
+pyflakes==3.0.1
     # via flake8
-pygments==2.11.2
-    # via sphinx
-pyparsing==3.0.7
+pygments==2.14.0
     # via
-    #   matplotlib
-    #   packaging
-pyshp==2.2.0
+    #   accessible-pygments
+    #   pydata-sphinx-theme
+    #   sphinx
+pyparsing==3.0.9
+    # via matplotlib
+pyproj==3.4.1
+    # via cartopy
+pyproject-hooks==1.0.0
+    # via build
+pyshp==2.3.1
     # via cartopy
 python-dateutil==2.8.2
     # via matplotlib
-pytz==2021.3
-    # via babel
 pyyaml==6.0
     # via pre-commit
-requests==2.27.1
+requests==2.28.2
     # via sphinx
-scipy==1.8.0
+scipy==1.10.1
     # via -r requirements.in
-setuptools-scm==6.4.2
-    # via matplotlib
-shapely==1.8.1.post1
+shapely==2.0.1
     # via cartopy
 six==1.16.0
-    # via
-    #   python-dateutil
-    #   virtualenv
+    # via python-dateutil
 snowballstemmer==2.2.0
     # via sphinx
 sortedcontainers==2.4.0
     # via pdfminer-six
-soupsieve==2.3.1
+soupsieve==2.4
     # via beautifulsoup4
-sphinx==4.4.0
+sphinx==6.1.3
     # via
     #   -r requirements.in
     #   pydata-sphinx-theme
-sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-applehelp==1.0.4
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-htmlhelp==2.0.1
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-toml==0.10.2
-    # via
-    #   autopep8
-    #   pre-commit
-tomli==2.0.1
-    # via
-    #   pep517
-    #   setuptools-scm
-urllib3==1.26.8
+urllib3==1.26.15
     # via requests
-virtualenv==20.13.1
+virtualenv==20.21.0
     # via pre-commit
-wheel==0.37.1
+wheel==0.40.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file: