Appveyor: use newer conda packages and only run all tests on one platform

jankatins · jankatins · commit 410444915292 · 2016-07-17T12:43:45.000+02:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -26,25 +26,25 @@ environment:
       # this variable only influence pdf/svg tests, png tests are run on any platform
       # only once, because it basically triples the testing times
       # pick the one which seems to make the most problems
-      TEST_ALL_IMAGES: "yes"
+      TEST_ALL: "yes"
       CONDA_INSTALL_LOCN: "C:\\Miniconda"
     - TARGET_ARCH: "x64"
       CONDA_PY: "27"
       CONDA_NPY: "18"
       PYTHON_VERSION: "2.7"
-      TEST_ALL_IMAGES: "no"
+      TEST_ALL: "no"
       CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
     - TARGET_ARCH: "x64"
       CONDA_PY: "34"
       CONDA_NPY: "110"
       PYTHON_VERSION: "3.4"
-      TEST_ALL_IMAGES: "no"
+      TEST_ALL: "no"
       CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
     - TARGET_ARCH: "x64"
       CONDA_PY: "35"
       CONDA_NPY: "110"
       PYTHON_VERSION: "3.5"
-      TEST_ALL_IMAGES: "no"
+      TEST_ALL: "no"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
 
 # We always use a 64-bit machine, but can build x86 distributions
@@ -116,23 +116,12 @@ test_script:
   - cmd: '"%DUMPBIN%" /DEPENDENTS lib\\matplotlib\\_png*.pyd | findstr png.*.dll && exit /b 1 || exit /b 0'
 
   # this are optional dependencies so that we don't skip so many tests...
-  # WORKAROUND: set miktex to the old version until I figured out whats wrong here...
-  - cmd: conda install -q pillow miktex=2.9.5857
-  # autoinstall latex packages (0=no, 1=autoinstall, 2=ask)
-  # this adds this to the registry!
-  - cmd: initexmf --set-config-value "[MPM]AutoInstall=1"
-  # we need to put the real exe files into PATH as subprocess can't call bat files
-  # this works for the "old" version of the miktex package, then next version should
-  # not need it
-  - set "PATH=%PATH%;%CONDA_PREFIX%\Library\miktex\miktex\bin"
-  # missing packages on conda-forge for ffmpeg avconv mencoder imagemagick inkscape
-  - cmd: conda install -q -c menpo ffmpeg # a repackaged version
+  - cmd: if x%TEST_ALL% == xyes; conda install -q pillow miktex inkscape
+  # missing packages on conda-forge for ffmpeg avconv mencoder imagemagick
+  - cmd: if x%TEST_ALL% == xyes; conda install -q -c menpo ffmpeg # a repackaged version
   # This install sometimes failed randomly :-(
   #- cmd: choco install imagemagick
-  # only install inkscape during one test run as it increases the runtime of one
-  # test run from 13 min -> 30 min
-  - cmd: if x%TEST_ALL_IMAGES% == xyes; choco install inkscape
-  - cmd: if x%TEST_ALL_IMAGES% == xyes; set "PATH=%PATH%;C:\Program Files\Inkscape\inkscape.com"
+
   # Test import of tkagg backend
   - python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
   # tests
