From 94c8abac1a92c415859154e489b347c76ad6bdfd Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sun, 8 Oct 2017 15:08:18 +0100 Subject: [PATCH 1/2] Clean up .appveyor.yml --- .appveyor.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index af3d322e8eae..0b56152d9227 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -63,15 +63,13 @@ install: - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%; - set PYTHONUNBUFFERED=1 # for obvci_appveyor_python_build_env.cmd - - conda update --all --yes - - conda install anaconda-client=1.6.3 --yes - - conda install -c conda-forge --yes obvious-ci + - conda config --set always_yes true + - conda config --set show_channel_urls yes + - conda update --all # for msinttypes and newer stuff - conda config --prepend channels conda-forge - - conda config --set show_channel_urls yes - - conda config --set always_yes true # For building conda packages - - conda install --yes conda-build jinja2 anaconda-client + - conda install conda-build jinja2 obvious-ci anaconda-client=1.6.3 # this is now the downloaded conda... - conda info -a From 38a367e095eeb1b6e1eb6eca5a7d6ab445272dc7 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 14 Nov 2017 20:06:49 +0000 Subject: [PATCH 2/2] Install dependencies earlier --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 0b56152d9227..e268e9d56867 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -89,6 +89,7 @@ install: - echo %PYTHON_VERSION% %TARGET_ARCH% # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124 - pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist + cycler pyparsing backports.functools-lru-cache # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3 # https://github.com/matplotlib/matplotlib/issues/9176