From bf4c30f6debe20f565f8723eadde4a14f37f35c4 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 09:58:07 +0200 Subject: [PATCH 1/7] CI use anaconda gcc compiler instead of ubuntu/debian one --- .travis.yml | 6 +++--- ci_scripts/install.sh | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17bbdfccd3..ea79bc9310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,8 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - gcc-4.8 - - g++-4.8 + #- gcc-4.8 + #- g++-4.8 - libatlas-dev - liblapack-dev - libatlas-base-dev @@ -43,7 +43,7 @@ env: install: # Necessary for random forest - - export CXX="g++-4.8" CC="gcc-4.8" + #- export CXX="g++-4.8" CC="gcc-4.8" - source ci_scripts/install.sh script: bash ci_scripts/test.sh after_success: source ci_scripts/success.sh diff --git a/ci_scripts/install.sh b/ci_scripts/install.sh index ed1e959bfd..86473fdc28 100644 --- a/ci_scripts/install.sh +++ b/ci_scripts/install.sh @@ -27,6 +27,10 @@ popd conda create -n testenv --yes python=$PYTHON_VERSION pip nose source activate testenv +# Install anaconda gcc compiler to have compiler compatible with the +# anaconda python executable +conda install gcc + # Install requirements in correct order cat requirements.txt | xargs -n 1 -L 1 pip install From 4d5bff3a75fecd02d0a778e095200d3440206568 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 10:10:32 +0200 Subject: [PATCH 2/7] CI stop conda from asking for confirmation --- ci_scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_scripts/install.sh b/ci_scripts/install.sh index 86473fdc28..8a76a0914c 100644 --- a/ci_scripts/install.sh +++ b/ci_scripts/install.sh @@ -29,7 +29,7 @@ source activate testenv # Install anaconda gcc compiler to have compiler compatible with the # anaconda python executable -conda install gcc +conda install gcc --yes # Install requirements in correct order cat requirements.txt | xargs -n 1 -L 1 pip install From 3cf134cae8151acf9df4d2fe6ff8a6ee6950916f Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 10:49:06 +0200 Subject: [PATCH 3/7] CI completely disable use of apt-get --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea79bc9310..0cc5cb9334 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ matrix: - os: osx cache: - apt: true + #apt: true # We use three different cache directory # to work around a Travis bug with multi-platform cache directories: @@ -20,17 +20,17 @@ cache: pip: true # command to install dependencies -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - #- gcc-4.8 - #- g++-4.8 - - libatlas-dev - - liblapack-dev - - libatlas-base-dev - - gfortran +#addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - gcc-4.8 +# - g++-4.8 +# - libatlas-dev +# - liblapack-dev +# - libatlas-base-dev +# - gfortran env: global: From 2a76e2ea9b8af556c367b9cd40017bb9ea9b65db Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 11:24:15 +0200 Subject: [PATCH 4/7] CI set language to generic for OSX --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0cc5cb9334..cfd595168f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,18 @@ os: matrix: allow_failures: - os: osx + + include: + - os: linux + python: 3.5 + + # Set language to generic to not break travis-ci + # https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-195620855 + # so far, this issue is still open and there is no good solution + # python will then be installed by anaconda + - os: osx + sudo: required + language: generic cache: #apt: true From 47e70200417b2baae0b739b250d6be2dc9505a66 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 12:59:03 +0200 Subject: [PATCH 5/7] CI specify full build matrix --- .travis.yml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfd595168f..9fd0720d85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,9 @@ matrix: include: - os: linux - python: 3.5 + DISTRIB="conda" PYTHON_VERSION="3.4" + - os: linux + DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" # Set language to generic to not break travis-ci # https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-195620855 @@ -21,9 +23,12 @@ matrix: - os: osx sudo: required language: generic + DISTRIB="conda" PYTHON_VERSION="3.4" + - os: osx + sudo: required + language: genericDISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" cache: - #apt: true # We use three different cache directory # to work around a Travis bug with multi-platform cache directories: @@ -31,27 +36,11 @@ cache: - $HOME/download pip: true -# command to install dependencies -#addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - gcc-4.8 -# - g++-4.8 -# - libatlas-dev -# - liblapack-dev -# - libatlas-base-dev -# - gfortran - env: global: # Directory where tests are run from - TEST_DIR=/tmp/test_dir/ - MODULE=autosklearn - matrix: - - DISTRIB="conda" PYTHON_VERSION="3.4" - - DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" install: # Necessary for random forest From d45cc14bf1b3f7450cfe4edfab1b3626bfade49a Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 13:04:06 +0200 Subject: [PATCH 6/7] CI add env identifier to fix format error --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9fd0720d85..ff082dbc0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ matrix: include: - os: linux - DISTRIB="conda" PYTHON_VERSION="3.4" + env: DISTRIB="conda" PYTHON_VERSION="3.4" - os: linux - DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" + env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" # Set language to generic to not break travis-ci # https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-195620855 @@ -23,10 +23,11 @@ matrix: - os: osx sudo: required language: generic - DISTRIB="conda" PYTHON_VERSION="3.4" + env: DISTRIB="conda" PYTHON_VERSION="3.4" - os: osx sudo: required - language: genericDISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" + language: generic + env: DISTRIB="conda" PYTHON_VERSION="3.5" cache: # We use three different cache directory From 28a4d5e80f12a7188b837a0b7e18322079993ab3 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Mon, 24 Oct 2016 13:11:57 +0200 Subject: [PATCH 7/7] CI remove OS from build matrix --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff082dbc0f..9db11785ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,6 @@ language: python sudo: false -os: - - linux - - osx - matrix: allow_failures: - os: osx @@ -37,6 +33,9 @@ cache: - $HOME/download pip: true +git: + depth: 5 + env: global: # Directory where tests are run from @@ -44,9 +43,8 @@ env: - MODULE=autosklearn install: - # Necessary for random forest - #- export CXX="g++-4.8" CC="gcc-4.8" - source ci_scripts/install.sh + script: bash ci_scripts/test.sh after_success: source ci_scripts/success.sh