From 31533c8df66a3695b81a10857833f0dd489ee4cd Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 12:26:14 +0000 Subject: [PATCH 1/8] Move to using new ROOT builds --- .travis.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3336d8..ab1abdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,11 @@ language: python matrix: include: - python: 2.7 - env: PYTHON=2.7 ROOT=5.34.32 - - python: 2.7 - env: PYTHON=2.7 ROOT=6.04 - - python: 3.4 - env: PYTHON=3.4 ROOT=5.34.32 - - python: 3.4 - env: PYTHON=3.4 ROOT=6.04 + env: PYTHON=2.7 + - python: 3.6 + env: PYTHON=3.6 + - python: 3.7 + env: PYTHON=3.7 install: - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl --silent http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh @@ -20,11 +18,9 @@ install: - export PATH="$HOME/miniconda/bin:$PATH" - hash -r - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - - conda info -a - - conda config --add channels http://conda.anaconda.org/NLeSC - - conda config --set show_channel_urls yes - - conda create -q -n testenv python=${PYTHON} root=${ROOT} pandas nose + - conda config --add channels conda-forge/label/gcc7 + - conda config --add channels chrisburr + - conda create -q -n testenv python=${PYTHON} root pandas nose - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv - source activate testenv - pip install --user --no-binary=root_numpy root_numpy==4.4.1 rootpy From 33f95f26a5d57413f25c437be14e10d139bdf615 Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 12:29:30 +0000 Subject: [PATCH 2/8] Fix CI configuration --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab1abdd..760d09f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,11 @@ language: python matrix: include: - - python: 2.7 + - python: 3.6 env: PYTHON=2.7 - python: 3.6 env: PYTHON=3.6 - - python: 3.7 + - python: 3.6 env: PYTHON=3.7 install: From 9d2b06c5650af7845f7f9a6e049206d5a7d0ea70 Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 12:42:37 +0000 Subject: [PATCH 3/8] Use a newer version of root_numpy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 760d09f..80bb16a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - conda create -q -n testenv python=${PYTHON} root pandas nose - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv - source activate testenv - - pip install --user --no-binary=root_numpy root_numpy==4.4.1 rootpy + - pip install --no-binary=root_numpy root_numpy rootpy - pip install coverage coveralls script: nosetests --with-coverage --cover-package=root_pandas From 676e2d59f7273863a2d9e8461e08de44e8a7fa9c Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 12:43:11 +0000 Subject: [PATCH 4/8] Make the closure smaller by using nomkl --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 80bb16a..1e0ce84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - conda config --set always_yes yes --set changeps1 no - conda config --add channels conda-forge/label/gcc7 - conda config --add channels chrisburr - - conda create -q -n testenv python=${PYTHON} root pandas nose + - conda create -q -n testenv python=${PYTHON} nomkl root pandas nose - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv - source activate testenv - pip install --no-binary=root_numpy root_numpy rootpy From 2df211e15106cc78e39476b293751173b77c622b Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 12:47:55 +0000 Subject: [PATCH 5/8] Simplify CI config further --- .travis.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e0ce84..4aa5d78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,9 @@ language: python matrix: include: - - python: 3.6 - env: PYTHON=2.7 - - python: 3.6 - env: PYTHON=3.6 - - python: 3.6 - env: PYTHON=3.7 + - env: PYTHON=2.7 + - env: PYTHON=3.6 + - env: PYTHON=3.7 install: - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl --silent http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh @@ -23,7 +20,7 @@ install: - conda create -q -n testenv python=${PYTHON} nomkl root pandas nose - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv - source activate testenv - - pip install --no-binary=root_numpy root_numpy rootpy + - pip install root_numpy rootpy - pip install coverage coveralls script: nosetests --with-coverage --cover-package=root_pandas From 2605fc791889856e1531b8a6c33d8a459366c1c7 Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 15:24:19 +0000 Subject: [PATCH 6/8] Use master of root_numpy for Python 3.7 --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4aa5d78..97c980e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,11 @@ install: - conda create -q -n testenv python=${PYTHON} nomkl root pandas nose - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv - source activate testenv + - if [ "${PYTHON}" == "3.7" ]; then + pip install git+https://github.com/scikit-hep/root_numpy.git + else + pip install root_numpy + fi - pip install root_numpy rootpy - pip install coverage coveralls From 836734dbab870975aefe45b9009f65951cd312f8 Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 15:31:23 +0000 Subject: [PATCH 7/8] Fix CI config again --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97c980e..c68dc15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,9 @@ install: - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv - source activate testenv - if [ "${PYTHON}" == "3.7" ]; then - pip install git+https://github.com/scikit-hep/root_numpy.git - else - pip install root_numpy + pip install git+https://github.com/scikit-hep/root_numpy.git; + else; + pip install root_numpy; fi - pip install root_numpy rootpy - pip install coverage coveralls From eb81cd50980f4a308ba6ca2f8630ce1e03906640 Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Tue, 13 Nov 2018 15:40:28 +0000 Subject: [PATCH 8/8] Fix CI config again again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c68dc15..1ec7dba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: - source activate testenv - if [ "${PYTHON}" == "3.7" ]; then pip install git+https://github.com/scikit-hep/root_numpy.git; - else; + else pip install root_numpy; fi - pip install root_numpy rootpy