Merge pull request matplotlib#30231 from QuLogic/preload-ci

ci: Preload existing test images from text-overhaul-figures branch

Author: QuLogic

.appveyor.yml

@@ -17,7 +17,7 @@ skip_commits:
 
 clone_depth: 50
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 environment:
 
@@ -60,6 +60,26 @@ install:
   - micromamba env create -f environment.yml python=%PYTHON_VERSION% pywin32
   - micromamba activate mpl-dev
 
+before_test:
+  - git config --global user.name 'Matplotlib'
+  - git config --global user.email 'nobody@matplotlib.org'
+  - git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
+  - git merge --no-commit text-overhaul-figures || true
+  # If there are any conflicts in baseline images, then pick "ours",
+  # which should be the updated images in the PR.
+  - ps: |
+      $conflicts = git diff --name-only --diff-filter=U `
+                     lib/matplotlib/tests/baseline_images `
+                     lib/mpl_toolkits/*/tests/baseline_images
+      if ($conflicts) {
+        git checkout --ours -- $conflicts
+        git add -- $conflicts
+      }
+      git status
+  # If committing fails, there were conflicts other than the baseline images,
+  # which should not be allowed to happen, and should fail the build.
+  - git commit -m "Preload test images from branch text-overhaul-figures"
+
 test_script:
   # Now build the thing..
   - set LINK=/LIBPATH:%cd%\lib

.github/workflows/cibuildwheel.yml

@@ -140,15 +140,27 @@ jobs:
           name: cibw-sdist
           path: dist/
 
+      - name: Build wheels for CPython 3.14
+        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        with:
+          package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
+        env:
+          CIBW_BUILD: "cp314-* cp314t-*"
+          CIBW_ENABLE: "cpython-freethreading cpython-prerelease"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+          CIBW_BEFORE_TEST: >-
+            python -m pip install
+            --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+            --upgrade --pre --only-binary=:all: contourpy numpy pillow
+
       - name: Build wheels for CPython 3.13
         uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp313-* cp313t-*"
           CIBW_ENABLE: cpython-freethreading
-          # No free-threading wheels available for aarch64 on Pillow.
-          CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.12
@@ -167,7 +179,6 @@ jobs:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-
       - name: Build wheels for PyPy
         uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
         with:
@@ -176,8 +187,6 @@ jobs:
           CIBW_BUILD: "pp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_ENABLE: pypy
-          # No wheels available for Pillow with pp311 yet.
-          CIBW_TEST_SKIP: "pp311*"
         if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858  # v3.29.0
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
         with:
           languages: ${{ matrix.language }}
 
@@ -43,4 +43,4 @@ jobs:
           pip install --user -v .
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858  # v3.29.0
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2

.github/workflows/tests.yml

@@ -95,6 +95,25 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
+      - name: Preload test images
+        run: |
+          git config --global user.name 'Matplotlib'
+          git config --global user.email 'nobody@matplotlib.org'
+          git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
+          git merge --no-commit text-overhaul-figures || true
+          # If there are any conflicts in baseline images, then pick "ours",
+          # which should be the updated images in the PR.
+          conflicts=$(git diff --name-only --diff-filter=U \
+                      lib/matplotlib/tests/baseline_images \
+                      lib/mpl_toolkits/*/tests/baseline_images)
+          if [ -n "${conflicts}" ]; then
+            git checkout --ours -- "${conflicts}"
+            git add -- "${conflicts}"
+          fi
+          # If committing fails, there were conflicts other than the baseline images,
+          # which should not be allowed to happen, and should fail the build.
+          git commit -m 'Preload test images from branch text-overhaul-figures'
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
         with:
@@ -346,13 +365,15 @@ jobs:
         run: |
           function remove_files() {
               local extension=$1
-              find ./result_images -type f -name "*-expected*.$extension" | while read file; do
+              find ./result_images -name "*-expected*.$extension" | while read file; do
                   if [[ $file == *"-expected_pdf"* ]]; then
                       base=${file%-expected_pdf.$extension}_pdf
                   elif [[ $file == *"-expected_eps"* ]]; then
                       base=${file%-expected_eps.$extension}_eps
                   elif [[ $file == *"-expected_svg"* ]]; then
                       base=${file%-expected_svg.$extension}_svg
+                  elif [[ $file == *"-expected_gif"* ]]; then
+                      base=${file%-expected_gif.$extension}_gif
                   else
                       base=${file%-expected.$extension}
                   fi
@@ -369,7 +390,7 @@ jobs:
               done
           }
 
-          remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps";
+          remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps"; remove_files "gif";
 
           if [ "$(find ./result_images -mindepth 1 -type d)" ]; then
               find ./result_images/* -type d -empty -delete

azure-pipelines.yml

@@ -68,6 +68,25 @@ stages:
               architecture: 'x64'
             displayName: 'Use Python $(python.version)'
 
+          - bash: |
+              git config --global user.name 'Matplotlib'
+              git config --global user.email 'nobody@matplotlib.org'
+              git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
+              git merge --no-commit text-overhaul-figures || true
+              # If there are any conflicts in baseline images, then pick "ours",
+              # which should be the updated images in the PR.
+              conflicts=$(git diff --name-only --diff-filter=U \
+                          lib/matplotlib/tests/baseline_images \
+                          lib/mpl_toolkits/*/tests/baseline_images)
+              if [ -n "${conflicts}" ]; then
+                git checkout --ours -- "${conflicts}"
+                git add -- "${conflicts}"
+              fi
+              # If committing fails, there were conflicts other than the baseline images,
+              # which should not be allowed to happen, and should fail the build.
+              git commit -m 'Preload test images from branch text-overhaul-figures'
+            displayName: Preload test images
+
           - bash: |
               choco install ninja
             displayName: 'Install dependencies'

doc/api/colors_api.rst

@@ -21,6 +21,7 @@ Color norms
    :toctree: _as_gen/
    :template: autosummary.rst
 
+   Norm
    Normalize
    NoNorm
    AsinhNorm

doc/api/next_api_changes/deprecations/30163-AL.rst

@@ -0,0 +1,9 @@
+``matplotlib.style.core``
+~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``matplotlib.style.core`` module is deprecated.  All APIs intended for
+public use are now available in `matplotlib.style` directly (including
+``USER_LIBRARY_PATHS``, which was previously not reexported).
+
+The following APIs of ``matplotlib.style.core`` have been deprecated with no
+replacement: ``BASE_LIBRARY_PATH``, ``STYLE_EXTENSION``, ``STYLE_BLACKLIST``,
+``update_user_library``, ``read_style_directory``, ``update_nested_dict``.

doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst

@@ -282,7 +282,7 @@ Miscellaneous deprecations
 - The *format* parameter of ``dviread.find_tex_file`` is deprecated (with no
   replacement).
 - ``FancyArrowPatch.get_path_in_displaycoord`` and
-  ``ConnectionPath.get_path_in_displaycoord`` are deprecated. The path in
+  ``ConnectionPatch.get_path_in_displaycoord`` are deprecated. The path in
   display coordinates can still be obtained, as for other patches, using
   ``patch.get_transform().transform_path(patch.get_path())``.
 - The ``font_manager.win32InstalledFonts`` and

doc/api/prev_api_changes/api_changes_3.7.0/removals.rst

@@ -323,7 +323,7 @@ Miscellaneous removals
 - The *format* parameter of ``dviread.find_tex_file`` is removed (with no
   replacement).
 - ``FancyArrowPatch.get_path_in_displaycoord`` and
-  ``ConnectionPath.get_path_in_displaycoord`` are removed. The path in
+  ``ConnectionPatch.get_path_in_displaycoord`` are removed. The path in
   display coordinates can still be obtained, as for other patches, using
   ``patch.get_transform().transform_path(patch.get_path())``.
 - The ``font_manager.win32InstalledFonts`` and

doc/devel/tag_guidelines.rst

@@ -61,7 +61,7 @@ Proposing new tags
 1. Review existing tag list, looking out for similar entries (i.e. ``axes`` and ``axis``).
 2. If a relevant tag or subcategory does not yet exist, propose it. Each tag is two
    parts: ``subcategory: tag``. Tags should be one or two words.
-3. New tags should be be added when they are relevant to existing gallery entries too.
+3. New tags should be added when they are relevant to existing gallery entries too.
    Avoid tags that will link to only a single gallery entry.
 4. Tags can recreate other forms of organization.