Merge 0f0a04d into f6eff8c

.travis.yml

@@ -1,24 +1,26 @@
 language: python
-python:
-    - 3.5
-    - 3.4
-    - 3.3
-    - 2.7
+
 sudo: false
-before_install:
-    - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
-    -  if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
-    - chmod +x miniconda.sh
-    - ./miniconda.sh -b
-    - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PATH=/home/travis/miniconda2/bin:$PATH; else export PATH=/home/travis/miniconda3/bin:$PATH; fi
-    - conda create -n qtconsole --yes pyqt
-    - source activate qtconsole
+
+env:
+    global:
+        - CONDA_DEPENDENCIES='pyqt traitlets ipython_genutils jupyter_core jupyter_client pygments ipykernel nose'
+        - PIP_DEPENDENCIES='coveralls'
+
+matrix:
+    include:
+        - python: "3.6"
+        - python: "3.5"
+        - python: "3.4"
+        - python: "2.7"
+          env: PIP_DEPENDENCIES="coveralls mock"
+
 install:
-    - source activate qtconsole
-    - conda install --yes pyzmq sphinx pygments
-    - pip install  --pre .[test] coveralls
-    - python -c 'import ipykernel.kernelspec; ipykernel.kernelspec.install(user=True)'
+    - git clone --depth 1 git://github.com/astropy/ci-helpers.git
+    - source ci-helpers/travis/setup_conda.sh
+
 script:
     - nosetests --with-coverage --cover-package qtconsole qtconsole
+
 after_success:
     - coveralls

README.md

@@ -2,6 +2,7 @@
 
 [![Google Group](https://img.shields.io/badge/-Google%20Group-lightgrey.svg)](https://groups.google.com/forum/#!forum/jupyter)
 [![Build Status](https://travis-ci.org/jupyter/qtconsole.svg?branch=master)](https://travis-ci.org/jupyter/qtconsole)
+[![Coverage Status](https://coveralls.io/repos/github/jupyter/qtconsole/badge.svg?branch=master)](https://coveralls.io/github/jupyter/qtconsole?branch=master)
 [![Documentation Status](https://readthedocs.org/projects/qtconsole/badge/?version=stable)](https://qtconsole.readthedocs.io/en/stable/)
 
 A rich Qt-based console for working with Jupyter kernels,