From d410ca4da41e34cabf8b6add55100af48f3a674b Mon Sep 17 00:00:00 2001 From: Rene Milk Date: Mon, 9 Jan 2017 15:47:29 +0100 Subject: [PATCH] [appveyor] hardcode pyevtk install --- .appveyor.yml | 6 +++++- setup.cfg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7f3e209b65..c756968402 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,8 +48,12 @@ install: - set PATH=%CONDA%;%CONDA%\Scripts;%PATH% - conda config --set always_yes yes --set changeps1 no - conda update -q conda + # hardcode a few installs that don't succeed otherwise - conda install numpy pip - - pip install --only-binary --no-index --find-links https://pymor.github.io/wheels/ pyside & echo pyside + - pip install --only-binary --no-index --find-links https://pymor.github.io/wheels/ pyside + + - if [%PYTHON_VERSION%]==["3.4"] ( conda remove numpy && pip install numpy ) + - for /f %%i in (requirements.txt requirements-optional.txt requirements-travis.txt ) do ( conda install %%i 1> nul 2>&1 & pip install %%i 1> nul 2>&1 & echo %%i ) diff --git a/setup.cfg b/setup.cfg index 99e377f87d..6634916b65 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ ignore = debian debian/* .landscape.yaml - .appveyor.yaml + .appveyor.yml .mailmap graveyard/* graveyard