From de927278abc934291c9e3ef54291efce847b73bb Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 9 Jul 2017 14:42:53 -0400 Subject: [PATCH 01/10] CI: put conda-forge first in channel list on appveyor --- .appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index de702931c187..32f6ae2d74c0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -68,9 +68,7 @@ install: # for obvci_appveyor_python_build_env.cmd - conda install -c pelson/channel/development --yes --quiet obvious-ci # for msinttypes and newer stuff - # conda-forge may serve outdated versions of certain packages (e.g. conda - # itself), so append it to the end of the list. - - conda config --append channels conda-forge + - conda config --prepend channels conda-forge - conda config --set show_channel_urls yes - conda config --set always_yes true # For building conda packages From d15aff5901f9c03e63d6b9298f5d683170cab47c Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 9 Jul 2017 15:14:07 -0500 Subject: [PATCH 02/10] CI: drop 2.7 build due to conda-build bug --- .appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 32f6ae2d74c0..cfb3c9039d77 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,12 +24,12 @@ environment: # theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit, # one for 64bit because we construct envs anyway. But using one for the # right python version is hopefully making it fast due to package caching. - - TARGET_ARCH: "x64" - CONDA_PY: "27" - CONDA_NPY: "18" - PYTHON_VERSION: "2.7" - TEST_ALL: "no" - CONDA_INSTALL_LOCN: "C:\\Miniconda-x64" + # - TARGET_ARCH: "x64" + # CONDA_PY: "27" + # CONDA_NPY: "18" + # PYTHON_VERSION: "2.7" + # TEST_ALL: "no" + # CONDA_INSTALL_LOCN: "C:\\Miniconda-x64" - TARGET_ARCH: "x64" CONDA_PY: "35" CONDA_NPY: "110" From 1d044b2ecaa95bd1140aaae3980b1c488100fdd1 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 9 Jul 2017 20:46:03 -0500 Subject: [PATCH 03/10] CI: move full test to python 3.6 --- .appveyor.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index cfb3c9039d77..671a0d5551e3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -36,16 +36,15 @@ environment: PYTHON_VERSION: "3.5" TEST_ALL: "no" CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64" - - TARGET_ARCH: "x86" - CONDA_PY: "27" - CONDA_NPY: "18" - PYTHON_VERSION: "2.7" + - TARGET_ARCH: "x64" + CONDA_PY: "36" + PYTHON_VERSION: "3.6" # this variable influence pdf/svg and most importantly the latex related tests # which triples the runtime of the tests (7-8min vs 30min). # pick the one which seems to make the most problems and run it last, so that # the rest of the tests can give feedback earlier TEST_ALL: "yes" - CONDA_INSTALL_LOCN: "C:\\Miniconda" + CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" # We always use a 64-bit machine, but can build x86 distributions # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV). From 54f0fc788f0d17954d87ec872242f5387e0679b4 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 9 Jul 2017 23:10:58 -0500 Subject: [PATCH 04/10] CI: pull obvious-ci from conda-forge, not personal channel --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 671a0d5551e3..243139a22e0e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -65,7 +65,7 @@ install: - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%; - set PYTHONUNBUFFERED=1 # for obvci_appveyor_python_build_env.cmd - - conda install -c pelson/channel/development --yes --quiet obvious-ci + - conda install -c conda-forge --yes --quiet obvious-ci # for msinttypes and newer stuff - conda config --prepend channels conda-forge - conda config --set show_channel_urls yes From 0156cc3baf138b07f5220db1112446ea4cd4dde4 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 10 Jul 2017 00:12:48 -0500 Subject: [PATCH 05/10] CI: drop python 3.6 due to weird errors on appveyor --- .appveyor.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 243139a22e0e..3288a0755d24 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -36,15 +36,15 @@ environment: PYTHON_VERSION: "3.5" TEST_ALL: "no" CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64" - - TARGET_ARCH: "x64" - CONDA_PY: "36" - PYTHON_VERSION: "3.6" - # this variable influence pdf/svg and most importantly the latex related tests - # which triples the runtime of the tests (7-8min vs 30min). - # pick the one which seems to make the most problems and run it last, so that - # the rest of the tests can give feedback earlier TEST_ALL: "yes" - CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" + # - TARGET_ARCH: "x64" + # CONDA_PY: "36" + # PYTHON_VERSION: "3.6" + # # this variable influence pdf/svg and most importantly the latex related tests + # # which triples the runtime of the tests (7-8min vs 30min). + # # pick the one which seems to make the most problems and run it last, so that + # # the rest of the tests can give feedback earlier + # CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" # We always use a 64-bit machine, but can build x86 distributions # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV). From fee443f7d9726d366395261bdef6c7a5527ccc15 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 10 Jul 2017 00:19:11 -0500 Subject: [PATCH 06/10] CI: fix appveyor syntax --- .appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3288a0755d24..a4760bc835c1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,7 +34,6 @@ environment: CONDA_PY: "35" CONDA_NPY: "110" PYTHON_VERSION: "3.5" - TEST_ALL: "no" CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64" TEST_ALL: "yes" # - TARGET_ARCH: "x64" From 574d3b16d23af26167dc2d5dc85d4d53b9c3b126 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 10 Jul 2017 01:01:46 -0500 Subject: [PATCH 07/10] CI: re-enable 3.6 but drop testall which seems to be the problem --- .appveyor.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a4760bc835c1..18b8553d34c9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,15 +35,16 @@ environment: CONDA_NPY: "110" PYTHON_VERSION: "3.5" CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64" - TEST_ALL: "yes" - # - TARGET_ARCH: "x64" - # CONDA_PY: "36" - # PYTHON_VERSION: "3.6" - # # this variable influence pdf/svg and most importantly the latex related tests - # # which triples the runtime of the tests (7-8min vs 30min). - # # pick the one which seems to make the most problems and run it last, so that - # # the rest of the tests can give feedback earlier - # CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" + TEST_ALL: "no" + - TARGET_ARCH: "x64" + CONDA_PY: "36" + PYTHON_VERSION: "3.6" + # this variable influence pdf/svg and most importantly the latex related tests + # which triples the runtime of the tests (7-8min vs 30min). + # pick the one which seems to make the most problems and run it last, so that + # the rest of the tests can give feedback earlier + CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" + TEST_ALL: "no" # We always use a 64-bit machine, but can build x86 distributions # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV). From c1e0a786bb426caffa5f7ca5d47e4c1741ddf6af Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 10 Jul 2017 07:20:52 -0500 Subject: [PATCH 08/10] CI: also specify a numpy version Going with 12 to be sure it works --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 18b8553d34c9..1b5b7fbcb94b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,6 +39,7 @@ environment: - TARGET_ARCH: "x64" CONDA_PY: "36" PYTHON_VERSION: "3.6" + CONDA_NPY: "112" # this variable influence pdf/svg and most importantly the latex related tests # which triples the runtime of the tests (7-8min vs 30min). # pick the one which seems to make the most problems and run it last, so that From a6d7bbca65b6bc71c3344a15cc30be204528c185 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 10 Jul 2017 09:07:40 -0500 Subject: [PATCH 09/10] CI: cargo-cult the 3.5 test setup --- .appveyor.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1b5b7fbcb94b..7855f9320d40 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,11 +39,7 @@ environment: - TARGET_ARCH: "x64" CONDA_PY: "36" PYTHON_VERSION: "3.6" - CONDA_NPY: "112" - # this variable influence pdf/svg and most importantly the latex related tests - # which triples the runtime of the tests (7-8min vs 30min). - # pick the one which seems to make the most problems and run it last, so that - # the rest of the tests can give feedback earlier + CONDA_NPY: "110" CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" TEST_ALL: "no" From 2f21f8db6d399a53be7c5ad5e1b5bb9980eab0e2 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 10 Jul 2017 09:53:31 -0500 Subject: [PATCH 10/10] CI: maybe numpy 111 works? --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7855f9320d40..982c3298c261 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,7 +39,7 @@ environment: - TARGET_ARCH: "x64" CONDA_PY: "36" PYTHON_VERSION: "3.6" - CONDA_NPY: "110" + CONDA_NPY: "111" CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" TEST_ALL: "no"