From 38a587c152965c1ce33272af32244ed5a938418b Mon Sep 17 00:00:00 2001
From: Ruth Comer <10599679+rcomer@users.noreply.github.com>
Date: Tue, 12 May 2026 11:17:54 +0100
Subject: [PATCH] Backport PR #31659: ci: Re-arrange AppVeyor pipeline

---
 .appveyor.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 13705adc99f9..4521bc876a8f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,16 +29,12 @@ environment:
 
   matrix:
     - PYTHON_VERSION: "3.11"
-      TEST_ALL: "yes"
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable
 platform:
   - x64
 
-# all our python builds have to happen in tests_script...
-build: false
-
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
   - '%USERPROFILE%\.cache\matplotlib'
@@ -57,10 +53,18 @@ init:
   - micromamba info
 
 install:
-  - micromamba env create -f environment.yml python=%PYTHON_VERSION% pywin32
+  - set EXTRA_PACKAGES=pywin32 codecov
+  # These are optional dependencies so that we don't skip so many tests...
+  - set EXTRA_PACKAGES=%EXTRA_PACKAGES% ffmpeg inkscape
+  # miktex is available on conda, but seems to fail with permission errors.
+  # missing packages on conda-forge for imagemagick
+  # This install sometimes failed randomly :-(
+  # - choco install imagemagick
+
+  - micromamba env create -f environment.yml python=%PYTHON_VERSION% %EXTRA_PACKAGES%
   - micromamba activate mpl-dev
 
-test_script:
+build_script:
   # Now build the thing..
   - set LINK=/LIBPATH:%cd%\lib
   - pip install -v --no-build-isolation --editable .[dev]
@@ -68,13 +72,7 @@ test_script:
   - set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
   - '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
 
-  # this are optional dependencies so that we don't skip so many tests...
-  - if x%TEST_ALL% == xyes micromamba install -q ffmpeg inkscape
-  # miktex is available on conda, but seems to fail with permission errors.
-  # missing packages on conda-forge for imagemagick
-  # This install sometimes failed randomly :-(
-  # - choco install imagemagick
-
+test_script:
   # Test import of tkagg backend
   - python -c
     "import matplotlib as m; m.use('tkagg');
@@ -90,7 +88,6 @@ artifacts:
     type: Zip
 
 on_finish:
-  - micromamba install codecov
   - codecov -e PYTHON_VERSION PLATFORM -n "%PYTHON_VERSION% Windows"
 
 on_failure: