matplotlib
diff --git a/‎appveyor.yml
Lines changed: 28 additions & 26 deletions b/‎appveyor.yml
Lines changed: 28 additions & 26 deletions
diff --git a/‎ci/appveyor/install.ps1
Lines changed: 0 additions & 96 deletions b/‎ci/appveyor/install.ps1
Lines changed: 0 additions & 96 deletions
diff --git a/‎ci/appveyor/run_with_env.cmd
Lines changed: 0 additions & 95 deletions b/‎ci/appveyor/run_with_env.cmd
Lines changed: 0 additions & 95 deletions
@@ -11,33 +11,31 @@ environment:
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
-    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\appveyor\\run_with_env.cmd"
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
+    CONDA_INSTALL_LOCN: "C:\\conda"
+    # Workaround for https://github.com/conda/conda-build/issues/636
+    PYTHONIOENCODING: "UTF-8"
 
   matrix:
-    - PYTHON: "C:\\Python34_64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      CONDA_PY: "34"
-      CONDA_NPY: "110"
-
-    - PYTHON: "C:\\Python35_64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      CONDA_PY: "35"
-      CONDA_NPY: "110"
-
-    - PYTHON: "C:\\Python27_64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
+    # for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
+    - TARGET_ARCH: "x86"
       CONDA_PY: "27"
       CONDA_NPY: "18"
-    
-    - PYTHON: "C:\\Python27_32"
       PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
+    - TARGET_ARCH: "x64"
       CONDA_PY: "27"
       CONDA_NPY: "18"
-      
+      PYTHON_VERSION: "2.7"
+    - TARGET_ARCH: "x64"
+      CONDA_PY: "34"
+      CONDA_NPY: "110"
+      PYTHON_VERSION: "3.4"
+    - TARGET_ARCH: "x64"
+      CONDA_PY: "35"
+      CONDA_NPY: "110"
+      PYTHON_VERSION: "3.5"
+
+
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
 platform:
@@ -47,17 +45,21 @@ platform:
 build: false
 
 init:
-  - "ECHO %PYTHON_VERSION% %PYTHON%"
+  - "ECHO %PYTHON_VERSION% %CONDA_INSTALL_LOCN%"
 
 install:
-  - powershell .\ci\appveyor\install.ps1
-  - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+  - appveyor DownloadFile "https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py"
+  - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% %CONDA_PY:~0,1% --without-obvci
+  - cmd: set PATH=%PATH%;%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts
+  - cmd: set PYTHONUNBUFFERED=1
+  - cmd: conda install -c http://conda.anaconda.org/pelson/channel/development --yes --quiet obvious-ci
+  - cmd: obvci_install_conda_build_tools.py
   - cmd: conda config --set show_channel_urls yes
   # for msinttypes
   - cmd: conda config --add channels conda-forge
   # this is now the downloaded conda...
   - conda info -a
-  # same things as in tools/conda_recipe
+  # same things as the requirements in ci/conda_recipe/meta.yaml
   - cmd: conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype=2.5 msinttypes tk pyparsing pytz tornado libpng zlib pyqt cycler nose mock
   - activate test-environment
   # This is needed for the installer to find the dlls...
@@ -89,8 +91,8 @@ after_test:
   - cmd: '%CMD_IN_ENV% conda build .\ci\conda_recipe'
   # Move the conda package into the dist directory, to register it
   # as an "artifact" for Appveyor. 
-  - cmd: 'copy /Y %PYTHON%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"'
-  - cmd: 'copy /Y %PYTHON%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"'
+  - cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"'
+  - cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"'
   - cmd: dir .\dist\
 
 artifacts: