Skip to content

Commit 12d2a4d

Browse files
committed
Update test images for font/text overhaul
This includes images changes for the following pull requests / commits: * [Fix center of rotation with rotation_mode='anchor'](matplotlib#29199) (c44db77) * [Remove ttconv backwards-compatibility code](matplotlib#30145) (8caff88) * [Remove kerning_factor from tests](matplotlib#29816) (7b4d725) * [Set text hinting to defaults](matplotlib#29816) (8255ae2) * [Update FreeType to 2.13.3](matplotlib#29816) (89c054d) * [Implement text shaping with libraqm](matplotlib#30000) (b0ded3a, 9813523) * [Add language parameter to Text objects](matplotlib#29794) (7ce8eae) * [Fix auto-sized glyphs with BaKoMa fonts](matplotlib#29936) (3ba2c13) * [pdf: Improve text with characters outside embedded font limits](matplotlib#30512) (b70fb88, 6cedcf7) * [Prepare `CharacterTracker` for advanced font features](matplotlib#30608) (8274e17, 70dc388, df670cf, ed5e074) * [Add font feature API to Text](matplotlib#29695) (972a688) * [Fix spacing in r"$\max f$"](matplotlib#30715) (4a99a83) * [Implement libraqm for vector outputs](matplotlib#30607) (bd17cd4) * [Drop the FT2Font intermediate buffer](matplotlib#30059) (9d7d7b4) * [Rasterize dvi files without dvipng](matplotlib#30039) (7627118) * [Update bundled FreeType and HarfBuzz libraries](matplotlib#30938) (a161658, 9619bcc) * [Fix positioning of wide mathtext accents](matplotlib#31069) (c2fa7ba) * [Refactor RendererAgg.draw_{mathtext,text,tex} to use same base algorithm](matplotlib#31085) (931bcf3) * [Implement TeX's fraction and script alignment](matplotlib#31046) (94ff452, 4bfa0f9, 1cd8510) * [Fix confusion between text height and ascent in metrics calculations](matplotlib#31107) (60f2310) * [mathtext: Fetch quad width & axis height from font metrics](matplotlib#31110) (692df3f, 383028b) * [mathtext: add mathnormal and distinguish between normal and italic family](matplotlib#31121) (a6913f3) * [ENH: Ignore empty text for tightbbox](matplotlib#31285) (d772043) * [Drop axis_artist tickdir image compat, due to text-overhaul merge](matplotlib#31281) (2057583) * [text: Use font metrics to determine line heights](matplotlib#31291) (3ab6a27, d961462, 97f4943) * [ps/pdf: Override font height metrics to support AFM files](matplotlib#31371) (e0913d4) * [TST: Cleanup back-compat code in tests touched by text overhaul](matplotlib#31295) (7c33379) * [TST: Set tests touched by text overhaul to mpl20 style](matplotlib#31300) (41c4d8d)
1 parent 8672cf9 commit 12d2a4d

1,826 files changed

Lines changed: 134744 additions & 97875 deletions

File tree

Some content is hidden

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

.appveyor.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,6 @@ 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-
8363
test_script:
8464
# Now build the thing..
8565
- set LINK=/LIBPATH:%cd%\lib

.github/workflows/tests.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,25 +102,6 @@ jobs:
102102
fetch-depth: 0
103103
persist-credentials: false
104104

105-
- name: Preload test images
106-
run: |
107-
git config --global user.name 'Matplotlib'
108-
git config --global user.email 'nobody@matplotlib.org'
109-
git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
110-
git merge --no-commit text-overhaul-figures || true
111-
# If there are any conflicts in baseline images, then pick "ours",
112-
# which should be the updated images in the PR.
113-
conflicts=$(git diff --name-only --diff-filter=U \
114-
lib/matplotlib/tests/baseline_images \
115-
lib/mpl_toolkits/*/tests/baseline_images)
116-
if [ -n "${conflicts}" ]; then
117-
git checkout --ours -- ${conflicts}
118-
git add -- ${conflicts}
119-
fi
120-
# If committing fails, there were conflicts other than the baseline images,
121-
# which should not be allowed to happen, and should fail the build.
122-
git commit -m 'Preload test images from branch text-overhaul-figures'
123-
124105
- name: Set up Python ${{ matrix.python-version }}
125106
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
126107
with:

.github/workflows/wasm.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,6 @@ jobs:
4444
fetch-depth: 0
4545
persist-credentials: false
4646

47-
- name: Preload test images
48-
run: |
49-
git config --global user.name 'Matplotlib'
50-
git config --global user.email 'nobody@matplotlib.org'
51-
git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
52-
git merge --no-commit text-overhaul-figures || true
53-
# If there are any conflicts in baseline images, then pick "ours",
54-
# which should be the updated images in the PR.
55-
conflicts=$(git diff --name-only --diff-filter=U \
56-
lib/matplotlib/tests/baseline_images \
57-
lib/mpl_toolkits/*/tests/baseline_images)
58-
if [ -n "${conflicts}" ]; then
59-
git checkout --ours -- ${conflicts}
60-
git add -- ${conflicts}
61-
fi
62-
# If committing fails, there were conflicts other than the baseline images,
63-
# which should not be allowed to happen, and should fail the build.
64-
git commit -m 'Preload test images from branch text-overhaul-figures'
65-
6647
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
6748
name: Install Python
6849
with:

azure-pipelines.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,6 @@ 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-
9071
- bash: |
9172
choco install ninja
9273
displayName: 'Install dependencies'
-4.51 KB
Loading
Binary file not shown.
-6.93 KB
Loading
-24.5 KB
Loading
-23.2 KB
Loading
-6.97 KB
Loading

0 commit comments

Comments
 (0)