From 0190fa6bab9076e4af490b17f3c7a33b33048c67 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 28 Mar 2023 04:34:45 -0400 Subject: [PATCH] Bump to Matplotlib 3.7.1 And also Cartopy to latest version to make it installable on current versions of Python. --- .bumpversion.cfg | 2 +- Makefile | 2 +- cheatsheets.tex | 2 +- check-matplotlib-version.py | 2 +- docs/conf.py | 3 +- handout-beginner.tex | 2 +- handout-intermediate.tex | 2 +- handout-tips.tex | 2 +- requirements/requirements.in | 4 +- requirements/requirements.txt | 139 ++++++++++++++++++---------------- 10 files changed, 84 insertions(+), 76 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3b8f56d..776285c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.6.3 +current_version = 3.7.4 [bumpversion:file:./check-matplotlib-version.py] search = __version__ == '{current_version}' diff --git a/Makefile b/Makefile index a5b05d5..b7e8177 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.6.3/doc/_static/logo2.png -O ./logos/logo2.png + wget https://github.com/matplotlib/matplotlib/raw/v3.7.4/doc/_static/logo2.png -O ./logos/logo2.png .PHONY: figures figures: diff --git a/cheatsheets.tex b/cheatsheets.tex index a7400bd..f7462c7 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.6.3}} + \put (80,1.5) {\tiny\Roboto \textcolor[HTML]{11557c}{Version 3.7.4}} \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 aea9dea..18b903f 100755 --- a/check-matplotlib-version.py +++ b/check-matplotlib-version.py @@ -2,4 +2,4 @@ import matplotlib as mpl -assert mpl.__version__ == '3.6.3' +assert mpl.__version__ == '3.7.4' diff --git a/docs/conf.py b/docs/conf.py index cc15a6d..a1f9ab2 100644 --- a/docs/conf.py +++ b/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 = { "**": [] diff --git a/handout-beginner.tex b/handout-beginner.tex index 0459774..da99d28 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.6.3 handout for beginners. + Matplotlib 3.7.4 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 239c256..7a6b679 100644 --- a/handout-intermediate.tex +++ b/handout-intermediate.tex @@ -198,7 +198,7 @@ \subsection*{\rmfamily Size \& DPI} \vfill % {\scriptsize - Matplotlib 3.6.3 handout for intermediate users. + Matplotlib 3.7.4 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 f523112..3e5e261 100644 --- a/handout-tips.tex +++ b/handout-tips.tex @@ -243,7 +243,7 @@ \subsection*{\rmfamily Read the documentation} \vfill % {\scriptsize - Matplotlib 3.6.3 handout for tips \& tricks. + Matplotlib 3.7.4 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 3e9986f..f36a79f 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -2,8 +2,8 @@ autopep8 bump2version cartopy==0.22.0 flake8 -matplotlib==3.6.3 -mpl-sphinx-theme +matplotlib==3.7.4 +mpl-sphinx-theme~=3.7.1 pillow>=9 pdfx pip-tools diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 2b41346..ea4ee51 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -6,168 +6,177 @@ # --no-binary shapely -alabaster==0.7.12 +accessible-pygments==0.0.4 + # via pydata-sphinx-theme +alabaster==0.7.16 # via sphinx -autopep8==1.6.0 +autopep8==2.0.4 # via -r requirements.in -babel==2.9.1 - # via sphinx -beautifulsoup4==4.10.0 +babel==2.14.0 + # via + # pydata-sphinx-theme + # sphinx +beautifulsoup4==4.12.3 # via pydata-sphinx-theme +build==1.0.3 + # via pip-tools bump2version==1.0.1 # via -r requirements.in cartopy==0.22.0 # via -r requirements.in -certifi==2021.10.8 +certifi==2023.11.17 # via # pyproj # requests -cffi==1.15.0 +cffi==1.16.0 # via cryptography -cfgv==3.3.1 +cfgv==3.4.0 # via pre-commit chardet==4.0.0 # via # pdfminer-six # pdfx -charset-normalizer==2.0.12 +charset-normalizer==3.3.2 # via requests -click==8.0.4 +click==8.1.7 # via pip-tools contourpy==1.2.0 # via matplotlib -cryptography==36.0.1 +cryptography==42.0.2 # via pdfminer-six -cycler==0.11.0 +cycler==0.12.1 # via matplotlib -distlib==0.3.4 +distlib==0.3.8 # via virtualenv -docutils==0.17.1 +docutils==0.20.1 # via # pydata-sphinx-theme # sphinx -filelock==3.6.0 +filelock==3.13.1 # via virtualenv -flake8==4.0.1 +flake8==7.0.0 # via -r requirements.in -fonttools==4.29.1 +fonttools==4.47.2 # via matplotlib -identify==2.4.11 +identify==2.5.33 # via pre-commit -idna==3.3 +idna==3.6 # via requests -imagesize==1.3.0 +imagesize==1.4.1 # via sphinx -jinja2==3.0.3 +jinja2==3.1.3 # via sphinx -kiwisolver==1.3.2 +kiwisolver==1.4.5 # via matplotlib -markupsafe==2.1.0 +markupsafe==2.1.4 # via jinja2 -matplotlib==3.6.3 +matplotlib==3.7.4 # via # -r requirements.in # cartopy -mccabe==0.6.1 + # 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.8.0 # via pre-commit -numpy==1.22.2 +numpy==1.26.3 # via # cartopy # contourpy # matplotlib # scipy -packaging==21.3 + # shapely +packaging==23.2 # via + # build # cartopy # matplotlib + # 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==10.2.0 # via # -r requirements.in # matplotlib -pip-tools==6.5.1 +pip-tools==7.3.0 # via -r requirements.in -platformdirs==2.5.1 +platformdirs==4.2.0 # via virtualenv -pre-commit==2.17.0 +pre-commit==3.6.0 # via -r requirements.in -pycodestyle==2.8.0 +pycodestyle==2.11.1 # via # autopep8 # flake8 pycparser==2.21 # via cffi -pydata-sphinx-theme==0.8.0 +pydata-sphinx-theme==0.15.2 # via mpl-sphinx-theme -pyflakes==2.4.0 +pyflakes==3.2.0 # via flake8 -pygments==2.11.2 - # via sphinx -pyparsing==3.0.7 +pygments==2.17.2 # via - # matplotlib - # packaging + # accessible-pygments + # pydata-sphinx-theme + # sphinx +pyparsing==3.1.1 + # via matplotlib pyproj==3.6.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 +pyyaml==6.0.1 # via pre-commit -requests==2.27.1 +requests==2.31.0 # via sphinx -scipy==1.8.0 +scipy==1.12.0 # via -r requirements.in -shapely==1.8.1.post1 +shapely==2.0.2 # 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.5 # via beautifulsoup4 -sphinx==4.4.0 +sphinx==7.2.6 # via # -r requirements.in # pydata-sphinx-theme -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx -toml==0.10.2 +tomli==2.0.1 # via # autopep8 - # pre-commit -tomli==2.0.1 - # via pep517 -urllib3==1.26.8 + # build + # pip-tools + # pyproject-hooks +typing-extensions==4.9.0 + # via pydata-sphinx-theme +urllib3==2.2.0 # via requests -virtualenv==20.13.1 +virtualenv==20.25.0 # via pre-commit wheel==0.42.0 # via pip-tools