From 8ef8aa32e6fe13969e14dd01635084b82b2ed0fa Mon Sep 17 00:00:00 2001 From: Christopher Burr Date: Wed, 30 Jan 2019 17:06:08 +0000 Subject: [PATCH] Use conda-forge's main channel for ROOT --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ec7dba..b980933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,16 +15,10 @@ install: - export PATH="$HOME/miniconda/bin:$PATH" - hash -r - 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} nomkl root pandas nose + - conda config --add channels conda-forge + - conda create -q -n testenv python=${PYTHON} 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