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/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..34902e5 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +--- +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + groups: + actions: + patterns: + - "*" diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index be64b1d..8ea3441 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -6,14 +6,14 @@ jobs: pre-commit: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - - uses: pre-commit/action@v3.0.0 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - uses: pre-commit/action@v3.0.1 build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies @@ -52,7 +52,7 @@ jobs: - name: Run checks run: | make check - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: build @@ -74,7 +74,7 @@ jobs: >> $GITHUB_STEP_SUMMARY - name: Publish cheatsheets and handouts if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./docs/_build/html/ diff --git a/Makefile b/Makefile index 1b7fbd1..aa863ad 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.7.4/doc/_static/logo2.png -O ./logos/logo2.png +all: figures cheatsheets handouts docs .PHONY: figures figures: diff --git a/cheatsheets.tex b/cheatsheets.tex index 1bc2079..c6a5257 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/fonts/Makefile b/fonts/Makefile index 7525dcf..96d20ee 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -7,7 +7,7 @@ ROBOTO_SLAB_ZIP := https://github.com/googlefonts/robotoslab/archive/a65e6d SOURCE_CODE_PRO_ZIP := https://github.com/adobe-fonts/source-code-pro/releases/download/2.038R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-2.038R-ro-1.058R-it.zip SOURCE_SANS_PRO_ZIP := https://github.com/adobe-fonts/source-sans/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip SOURCE_SERIF_PRO_ZIP := https://github.com/adobe-fonts/source-serif/releases/download/3.001R/source-serif-pro-3.001R.zip -PACIFICO_ZIP := https://fonts.google.com/download?family=Pacifico +PACIFICO := https://raw.githubusercontent.com/googlefonts/Pacifico/refs/heads/main/fonts/ttf/Pacifico-Regular.ttf UNZIP_FLAGS := -x "__MACOSX/*" @@ -25,7 +25,7 @@ all: sources cd source-code-pro && unzip -j /tmp/source-code-pro.zip "*.otf" $(UNZIP_FLAGS) cd source-sans-pro && unzip -j /tmp/source-sans-pro.zip "source-sans-pro-2.045R-ro-1.095R-it/OTF/*.otf" $(UNZIP_FLAGS) cd source-serif-pro && unzip -j /tmp/source-serif-pro.zip "source-serif-pro-3.001R/OTF/*.otf" $(UNZIP_FLAGS) - cd pacifico && unzip -j /tmp/pacifico.zip "*.ttf" $(UNZIP_FLAGS) + cd pacifico && cp /tmp/pacifico.ttf . .PHONY: sources sources: @@ -36,7 +36,7 @@ sources: wget $(SOURCE_CODE_PRO_ZIP) -O /tmp/source-code-pro.zip wget $(SOURCE_SANS_PRO_ZIP) -O /tmp/source-sans-pro.zip wget $(SOURCE_SERIF_PRO_ZIP) -O /tmp/source-serif-pro.zip - wget $(PACIFICO_ZIP) -O /tmp/pacifico.zip + wget $(PACIFICO) -O /tmp/pacifico.ttf .PHONY: clean clean: diff --git a/handout-beginner.tex b/handout-beginner.tex index 37b0e05..58be029 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 16f85f5..93d7b68 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 a6f7dd4..84ddede 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 bf5cc75..2b1dd17 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 pillow>=9 pdfx pip-tools diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8b7532b..d157b29 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -22,7 +22,7 @@ bump2version==1.0.1 # via -r requirements.in cartopy==0.22.0 # via -r requirements.in -certifi==2023.11.17 +certifi==2024.7.4 # via # pyproj # requests @@ -40,7 +40,7 @@ click==8.1.7 # via pip-tools contourpy==1.2.0 # via matplotlib -cryptography==42.0.4 +cryptography==44.0.1 # via pdfminer-six cycler==0.12.1 # via matplotlib @@ -62,13 +62,13 @@ idna==3.7 # via requests imagesize==1.4.1 # via sphinx -jinja2==3.1.3 +jinja2==3.1.5 # via sphinx 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 @@ -97,7 +97,7 @@ pdfminer-six==20201018 # via pdfx pdfx==1.4.1 # via -r requirements.in -pillow==10.2.0 +pillow==10.3.0 # via # -r requirements.in # matplotlib @@ -136,7 +136,7 @@ python-dateutil==2.8.2 # via matplotlib pyyaml==6.0.1 # via pre-commit -requests==2.31.0 +requests==2.32.2 # via sphinx scipy==1.12.0 # via -r requirements.in @@ -177,9 +177,9 @@ tomli==2.0.1 # pyproject-hooks typing-extensions==4.9.0 # via pydata-sphinx-theme -urllib3==2.2.0 +urllib3==2.2.2 # via requests -virtualenv==20.25.0 +virtualenv==20.26.6 # via pre-commit wheel==0.42.0 # via pip-tools diff --git a/scripts/markers.py b/scripts/markers.py index 48f1d01..0780d12 100644 --- a/scripts/markers.py +++ b/scripts/markers.py @@ -27,7 +27,6 @@ ".", "o", "s", "P", "X", "*", "p", "D", "<", ">", "^", "v", ] for x, y, marker in zip(X, Y, markers): if y == 3: fc = "white" - elif y == 2: fc = "None" else: fc = "C1" plt.scatter(x, 1+y, s=100, marker=marker, fc=fc, ec="C1", lw=0.5)