Skip to content

Commit 4d47644

Browse files
QuLogicQuLogic
authored
Merge pull request #30231 from QuLogic/preload-ci
ci: Preload existing test images from text-overhaul-figures branch
2 parents bb9aae4 + 389373e commit 4d47644

File tree

140 files changed

+1473
-792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1473
-792
lines changed

‎.appveyor.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ skip_commits:
1717

1818
clone_depth: 50
1919

20-
image: Visual Studio 2019
20+
image: Visual Studio 2022
2121

2222
environment:
2323

@@ -60,6 +60,26 @@ install:
6060
- micromamba env create -f environment.yml python=%PYTHON_VERSION% pywin32
6161
- micromamba activate mpl-dev
6262

63+
before_test:
64+
- git config --global user.name 'Matplotlib'
65+
- git config --global user.email 'nobody@matplotlib.org'
66+
- git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
67+
- git merge --no-commit text-overhaul-figures || true
68+
# If there are any conflicts in baseline images, then pick "ours",
69+
# which should be the updated images in the PR.
70+
- ps: |
71+
$conflicts = git diff --name-only --diff-filter=U `
72+
lib/matplotlib/tests/baseline_images `
73+
lib/mpl_toolkits/*/tests/baseline_images
74+
if ($conflicts) {
75+
git checkout --ours -- $conflicts
76+
git add -- $conflicts
77+
}
78+
git status
79+
# If committing fails, there were conflicts other than the baseline images,
80+
# which should not be allowed to happen, and should fail the build.
81+
- git commit -m "Preload test images from branch text-overhaul-figures"
82+
6383
test_script:
6484
# Now build the thing..
6585
- set LINK=/LIBPATH:%cd%\lib

‎.github/workflows/cibuildwheel.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,27 @@ jobs:
140140
name: cibw-sdist
141141
path: dist/
142142

143+
- name: Build wheels for CPython 3.14
144+
uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0
145+
with:
146+
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
147+
env:
148+
CIBW_BUILD: "cp314-* cp314t-*"
149+
CIBW_ENABLE: "cpython-freethreading cpython-prerelease"
150+
CIBW_ARCHS: ${{ matrix.cibw_archs }}
151+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
152+
CIBW_BEFORE_TEST: >-
153+
python -m pip install
154+
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
155+
--upgrade --pre --only-binary=:all: contourpy numpy pillow
156+
143157
- name: Build wheels for CPython 3.13
144158
uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0
145159
with:
146160
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
147161
env:
148162
CIBW_BUILD: "cp313-* cp313t-*"
149163
CIBW_ENABLE: cpython-freethreading
150-
# No free-threading wheels available for aarch64 on Pillow.
151-
CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"
152164
CIBW_ARCHS: ${{ matrix.cibw_archs }}
153165

154166
- name: Build wheels for CPython 3.12
@@ -167,7 +179,6 @@ jobs:
167179
CIBW_BUILD: "cp311-*"
168180
CIBW_ARCHS: ${{ matrix.cibw_archs }}
169181

170-
171182
- name: Build wheels for PyPy
172183
uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0
173184
with:
@@ -176,8 +187,6 @@ jobs:
176187
CIBW_BUILD: "pp311-*"
177188
CIBW_ARCHS: ${{ matrix.cibw_archs }}
178189
CIBW_ENABLE: pypy
179-
# No wheels available for Pillow with pp311 yet.
180-
CIBW_TEST_SKIP: "pp311*"
181190
if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
182191

183192
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
35+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
3636
with:
3737
languages: ${{ matrix.language }}
3838

@@ -43,4 +43,4 @@ jobs:
4343
pip install --user -v .
4444
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
46+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

‎.github/workflows/tests.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,25 @@ jobs:
9595
fetch-depth: 0
9696
persist-credentials: false
9797

98+
- name: Preload test images
99+
run: |
100+
git config --global user.name 'Matplotlib'
101+
git config --global user.email 'nobody@matplotlib.org'
102+
git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
103+
git merge --no-commit text-overhaul-figures || true
104+
# If there are any conflicts in baseline images, then pick "ours",
105+
# which should be the updated images in the PR.
106+
conflicts=$(git diff --name-only --diff-filter=U \
107+
lib/matplotlib/tests/baseline_images \
108+
lib/mpl_toolkits/*/tests/baseline_images)
109+
if [ -n "${conflicts}" ]; then
110+
git checkout --ours -- "${conflicts}"
111+
git add -- "${conflicts}"
112+
fi
113+
# If committing fails, there were conflicts other than the baseline images,
114+
# which should not be allowed to happen, and should fail the build.
115+
git commit -m 'Preload test images from branch text-overhaul-figures'
116+
98117
- name: Set up Python ${{ matrix.python-version }}
99118
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
100119
with:
@@ -346,13 +365,15 @@ jobs:
346365
run: |
347366
function remove_files() {
348367
local extension=$1
349-
find ./result_images -type f -name "*-expected*.$extension" | while read file; do
368+
find ./result_images -name "*-expected*.$extension" | while read file; do
350369
if [[ $file == *"-expected_pdf"* ]]; then
351370
base=${file%-expected_pdf.$extension}_pdf
352371
elif [[ $file == *"-expected_eps"* ]]; then
353372
base=${file%-expected_eps.$extension}_eps
354373
elif [[ $file == *"-expected_svg"* ]]; then
355374
base=${file%-expected_svg.$extension}_svg
375+
elif [[ $file == *"-expected_gif"* ]]; then
376+
base=${file%-expected_gif.$extension}_gif
356377
else
357378
base=${file%-expected.$extension}
358379
fi
@@ -369,7 +390,7 @@ jobs:
369390
done
370391
}
371392
372-
remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps";
393+
remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps"; remove_files "gif";
373394
374395
if [ "$(find ./result_images -mindepth 1 -type d)" ]; then
375396
find ./result_images/* -type d -empty -delete

‎azure-pipelines.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,25 @@ stages:
6868
architecture: 'x64'
6969
displayName: 'Use Python $(python.version)'
7070

71+
- bash: |
72+
git config --global user.name 'Matplotlib'
73+
git config --global user.email 'nobody@matplotlib.org'
74+
git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
75+
git merge --no-commit text-overhaul-figures || true
76+
# If there are any conflicts in baseline images, then pick "ours",
77+
# which should be the updated images in the PR.
78+
conflicts=$(git diff --name-only --diff-filter=U \
79+
lib/matplotlib/tests/baseline_images \
80+
lib/mpl_toolkits/*/tests/baseline_images)
81+
if [ -n "${conflicts}" ]; then
82+
git checkout --ours -- "${conflicts}"
83+
git add -- "${conflicts}"
84+
fi
85+
# If committing fails, there were conflicts other than the baseline images,
86+
# which should not be allowed to happen, and should fail the build.
87+
git commit -m 'Preload test images from branch text-overhaul-figures'
88+
displayName: Preload test images
89+
7190
- bash: |
7291
choco install ninja
7392
displayName: 'Install dependencies'

‎doc/api/colors_api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Color norms
2121
:toctree: _as_gen/
2222
:template: autosummary.rst
2323

24+
Norm
2425
Normalize
2526
NoNorm
2627
AsinhNorm

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
``matplotlib.style.core``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~
3+
The ``matplotlib.style.core`` module is deprecated. All APIs intended for
4+
public use are now available in `matplotlib.style` directly (including
5+
``USER_LIBRARY_PATHS``, which was previously not reexported).
6+
7+
The following APIs of ``matplotlib.style.core`` have been deprecated with no
8+
replacement: ``BASE_LIBRARY_PATH``, ``STYLE_EXTENSION``, ``STYLE_BLACKLIST``,
9+
``update_user_library``, ``read_style_directory``, ``update_nested_dict``.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ Miscellaneous deprecations
282282
- The *format* parameter of ``dviread.find_tex_file`` is deprecated (with no
283283
replacement).
284284
- ``FancyArrowPatch.get_path_in_displaycoord`` and
285-
``ConnectionPath.get_path_in_displaycoord`` are deprecated. The path in
285+
``ConnectionPatch.get_path_in_displaycoord`` are deprecated. The path in
286286
display coordinates can still be obtained, as for other patches, using
287287
``patch.get_transform().transform_path(patch.get_path())``.
288288
- The ``font_manager.win32InstalledFonts`` and

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ Miscellaneous removals
323323
- The *format* parameter of ``dviread.find_tex_file`` is removed (with no
324324
replacement).
325325
- ``FancyArrowPatch.get_path_in_displaycoord`` and
326-
``ConnectionPath.get_path_in_displaycoord`` are removed. The path in
326+
``ConnectionPatch.get_path_in_displaycoord`` are removed. The path in
327327
display coordinates can still be obtained, as for other patches, using
328328
``patch.get_transform().transform_path(patch.get_path())``.
329329
- The ``font_manager.win32InstalledFonts`` and

‎doc/devel/tag_guidelines.rst

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy