Merge 165a802 into 9f3dec5

.travis.yml

@@ -6,21 +6,9 @@ language: python
 matrix:
   include:
     - python: 2.7
-      env: MATPLOTLIB_VERSION=1.4.3 DISPLAY=:99.0
-    - python: 3.3
-      env: MATPLOTLIB_VERSION=1.4.3 DISPLAY=:99.0
-    - python: 3.4
-      env: MATPLOTLIB_VERSION=1.4.3 DISPLAY=:99.0
+      env: MATPLOTLIB_VERSION=1.5.3 DISPLAY=:99.0
     - python: 3.5
-      env: MATPLOTLIB_VERSION=1.4.3 DISPLAY=:99.0
-    - python: 2.7
-      env: MATPLOTLIB_VERSION=1.5.0 DISPLAY=:99.0
-    - python: 3.5
-      env: MATPLOTLIB_VERSION=1.5.0 DISPLAY=:99.0
-    - python: 2.7
-      env: MATPLOTLIB_VERSION=1.5.1 DISPLAY=:99.0
-    - python: 3.5
-      env: MATPLOTLIB_VERSION=1.5.1 DISPLAY=:99.0
+      env: MATPLOTLIB_VERSION=1.5.3 DISPLAY=:99.0
 #  allow_failures:
 #    - python: "nightly"
 
@@ -51,9 +39,9 @@ install:
   # conda line below will keep everything up-to-date.
   # This saves us some downloading for this version
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+      wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
     else
-      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+      wget 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"
@@ -67,18 +55,13 @@ install:
   - conda create -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy scipy pandas pytest
   - source activate test-environment
 
-  # When 1.5.0 is released, can use only conda.
-  - if [[ "$MATPLOTLIB_VERSION" == "1.4.3" ]]; then
-      conda install -n test-environment matplotlib=$MATPLOTLIB_VERSION;
-    else
-      pip install git+https://github.com/matplotlib/matplotlib.git@v$MATPLOTLIB_VERSION;
-    fi
+  - pip install git+https://github.com/matplotlib/matplotlib.git@v$MATPLOTLIB_VERSION;
 
   # Build in place so we can run tests
   - pip install python-coveralls pytest-cov
   - pip install .
 # command to run tests
-script: py.test --cov=lifelines -vv --block=False --cov-report term-missing
+script: py.test -s --cov=lifelines -vv --block=False --cov-report term-missing
 after_success:
   coveralls
 # Don't want notifications

dev-requirements.txt

@@ -1,4 +1,4 @@
 -r requirements.txt
 pytest
 python-coveralls
-pytest-cov
+pytest-cov