Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit 80a96b4

Browse files
authored
Merge pull request #77 from chrisburr/fix-ci
Fix ROOT builds on Travis CI
2 parents dfa32a4 + eb81cd5 commit 80a96b4

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

.travis.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ language: python
22

33
matrix:
44
include:
5-
- python: 2.7
6-
env: PYTHON=2.7 ROOT=5.34.32
7-
- python: 2.7
8-
env: PYTHON=2.7 ROOT=6.04
9-
- python: 3.4
10-
env: PYTHON=3.4 ROOT=5.34.32
11-
- python: 3.4
12-
env: PYTHON=3.4 ROOT=6.04
5+
- env: PYTHON=2.7
6+
- env: PYTHON=3.6
7+
- env: PYTHON=3.7
138

149
install:
1510
- if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl --silent http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh
@@ -20,14 +15,17 @@ install:
2015
- export PATH="$HOME/miniconda/bin:$PATH"
2116
- hash -r
2217
- conda config --set always_yes yes --set changeps1 no
23-
- conda update -q conda
24-
- conda info -a
25-
- conda config --add channels http://conda.anaconda.org/NLeSC
26-
- conda config --set show_channel_urls yes
27-
- conda create -q -n testenv python=${PYTHON} root=${ROOT} pandas nose
18+
- conda config --add channels conda-forge/label/gcc7
19+
- conda config --add channels chrisburr
20+
- conda create -q -n testenv python=${PYTHON} nomkl root pandas nose
2821
- export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv
2922
- source activate testenv
30-
- pip install --user --no-binary=root_numpy root_numpy==4.4.1 rootpy
23+
- if [ "${PYTHON}" == "3.7" ]; then
24+
pip install git+https://github.com/scikit-hep/root_numpy.git;
25+
else
26+
pip install root_numpy;
27+
fi
28+
- pip install root_numpy rootpy
3129
- pip install coverage coveralls
3230

3331
script: nosetests --with-coverage --cover-package=root_pandas

0 commit comments

Comments
 (0)