[pull] master from matplotlib:master

.bumpversion.cfg

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

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 jobs:
   build_docs:
     docker:
-      - image: circleci/python:3.9
+      - image: cimg/python:3.9
     steps:
       - checkout
       - run:

.github/workflows/main.yaml

@@ -6,24 +6,22 @@ jobs:
   pre-commit:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - uses: pre-commit/action@v2.0.0
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - uses: pre-commit/action@v3.0.0
   build:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install \
             fontconfig    \
             imagemagick   \
-            libgeos++-dev \
-            libproj-dev   \
             poppler-utils
           python -m pip install --upgrade pip
           pip install -r requirements/requirements.txt
@@ -54,14 +52,26 @@ jobs:
       - name: Run checks
         run: |
           make check
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: build
           path: |
             cheatsheets.pdf
             handout-*.pdf
             ./docs/_build/html/
+      - uses: actions/upload-artifact@v4
+        id: diffs-artifact-upload
+        if: ${{ always() }}
+        with:
+          name: diffs
+          path: |
+            diffs/
+      - name: Output artifacts URL
+        run: |
+          echo 'Artifact URL:' \
+            '${{ steps.diffs-artifact-upload.outputs.artifact-url }}' \
+            >> $GITHUB_STEP_SUMMARY
       - name: Publish cheatsheets and handouts
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         uses: peaceiris/actions-gh-pages@v3

Makefile

@@ -1,4 +1,5 @@
 SRC := $(wildcard *.tex)
+CONVERTFLAGS = -density 150 -alpha remove -depth 8
 
 .PHONY: default
 default: all
@@ -8,30 +9,39 @@ 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.4/doc/_static/logo2.png -O ./logos/logo2.png
 
 .PHONY: figures
 figures:
 	# generate the figures
 	cd scripts && for script in *.py; do echo $$script; MPLBACKEND="agg" python $$script; done
-	# crop the figures
-	cd figures && for figure in *.pdf; do echo $$figure; pdfcrop $$figure $$figure; done
-	# regenerate some figures that should not be cropped
-	cd scripts && MPLBACKEND="agg" python styles.py
+	# crop some of the figures
+	cd figures && pdfcrop adjustments.pdf adjustments.pdf
+	cd figures && pdfcrop annotate.pdf annotate.pdf
+	cd figures && pdfcrop annotation-arrow-styles.pdf annotation-arrow-styles.pdf
+	cd figures && pdfcrop anatomy.pdf anatomy.pdf
+	cd figures && pdfcrop colornames.pdf colornames.pdf
+	cd figures && pdfcrop fonts.pdf fonts.pdf
+	cd figures && pdfcrop markers.pdf markers.pdf
+	cd figures && pdfcrop text-alignments.pdf text-alignments.pdf
+	cd figures && pdfcrop tick-formatters.pdf tick-formatters.pdf
+	cd figures && pdfcrop tick-locators.pdf tick-locators.pdf
+	cd figures && pdfcrop tip-font-family.pdf tip-font-family.pdf
+	cd figures && pdfcrop tip-hatched.pdf tip-hatched.pdf
 
 .PHONY: cheatsheets
 cheatsheets:
 	xelatex cheatsheets.tex
-	convert -density 150 cheatsheets.pdf -scene 1 cheatsheets.png
+	convert $(CONVERTFLAGS) cheatsheets.pdf -scene 1 cheatsheets.png
 
 .PHONY: handouts
 handouts:
 	xelatex handout-beginner.tex
 	xelatex handout-intermediate.tex
 	xelatex handout-tips.tex
-	convert -density 150 handout-tips.pdf handout-tips.png
-	convert -density 150 handout-beginner.pdf handout-beginner.png
-	convert -density 150 handout-intermediate.pdf handout-intermediate.png
+	convert $(CONVERTFLAGS) handout-tips.pdf handout-tips.png
+	convert $(CONVERTFLAGS) handout-beginner.pdf handout-beginner.png
+	convert $(CONVERTFLAGS) handout-intermediate.pdf handout-intermediate.png
 
 .PHONY: check
 check:
@@ -40,6 +50,7 @@ check:
 	./check-num-pages.sh handout-tips.pdf 1
 	./check-num-pages.sh handout-beginner.pdf 1
 	./check-num-pages.sh handout-intermediate.pdf 1
+	./check-diffs.py
 	./check-links.py cheatsheets.pdf
 
 .PHONY: docs