Merge pull request #371 from chrisburr/fix-ci

Fix CI

Author: kratsg

.travis.yml

@@ -6,29 +6,24 @@ 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 COVERAGE=1
+        - env: PYTHON=2.7 COVERAGE=1
+        - env: PYTHON=3.6 COVERAGE=1
+        - env: PYTHON=3.7 COVERAGE=1
 
 #install: source ci/install.sh
 install:
   - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl --silent http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -o miniconda.sh; fi
   - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then wget -nv http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
-  
+
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a # Useful for debugging any issues with conda
-  - 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} numpy nose sphinx
+  - conda config --add channels conda-forge/label/gcc7
+  - conda config --add channels chrisburr
+  - conda create -q -n testenv python=${PYTHON} nomkl root nose sphinx
   - export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv
   - source activate testenv
   - pip install coverage coveralls

Makefile

@@ -101,8 +101,7 @@ test-coverage: in
 	@rm -rf coverage .coverage
 	@$(NOSETESTS) -s -v -a '!slow' --with-coverage \
 		--cover-erase --cover-branches \
-		--cover-min-percentage=100 \
-		--cover-html --cover-html-dir=coverage root_numpy
+		--cover-html --cover-html-dir=coverage --cover-package=root_numpy
 	@if [ "$(INTERACTIVE)" -eq "1" ]; then \
 		$(OPEN) coverage/index.html; \
 	fi;