Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7f5762b

Browse files
committed
Update test images for font/text overhaul [skip ci]
1 parent 17b1f31 commit 7f5762b

1,820 files changed

Lines changed: 133218 additions & 93447 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 '[email protected]'
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 '[email protected]'
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:

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 '[email protected]'
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'
87 Bytes
Loading
Binary file not shown.
-113 Bytes
Loading
7.58 KB
Loading
6.22 KB
Loading
62 Bytes
Loading
-3.34 KB
Loading

0 commit comments

Comments
 (0)