From 8b00726ae190e3ba21477213fbaeb89ea967d216 Mon Sep 17 00:00:00 2001
From: Forest Gregg <fgregg@uchicago.edu>
Date: Mon, 2 Apr 2018 14:24:39 -0500
Subject: [PATCH] pin IPython and simplify travis to fix tests

---
 .travis.yml      | 32 +++-----------------------------
 requirements.txt |  6 ------
 setup.py         | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/.travis.yml b/.travis.yml
index 621362a..2ce0606 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,39 +11,13 @@ notifications:
 
 # Setup anaconda
 before_install:
-  #- sudo add-apt-repository ppa:octave/stable -y
-  #- sudo apt-get update -q
-  #- sudo apt-get install gdebi -y
-  #- wget https://github.com/jgm/pandoc/releases/download/1.17.0.2/pandoc-1.17.0.2-1-amd64.deb
-  #- sudo gdebi pandoc-1.17.0.2-1-amd64.deb -n
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-  - chmod +x miniconda.sh
-  - ./miniconda.sh -b
-  - export PATH=/home/travis/miniconda3/bin:$PATH
-  - conda update --yes conda
-  # The next couple lines fix a crash with multiprocessing on Travis and are not specific to using Miniconda
-  - sudo rm -rf /dev/shm
-  - sudo ln -s /run/shm /dev/shm
-# Install packages
+  - pip install --upgrade pip
+  - pip install python-coveralls
 install:
-  - conda install --yes nomkl
-  - conda install --yes python=$TRAVIS_PYTHON_VERSION scipy matplotlib markdown pygments coverage ipython nose nbformat jupyter_client nbconvert notebook
-  - conda install --yes -c conda-forge pandoc
-  #- pip install -r requirements.txt
-  # Coverage packages are on my binstar channel
-  #- conda install --yes -c dan_blanchard python-coveralls nose-cov
-  - python -c "import matplotlib"
-  - pip install python-coveralls #nose-cov
-  - python setup.py install
+  - pip install -e .[test]
 
-
-# Recipe from http://dan-blanchard.roughdraft.io/7045057-quicker-travis-builds-that-rely-on-numpy-and-scipy-using-miniconda
-# Run test
 script:
   - nosetests --with-coverage --cover-package=pweave
-#  - nosetests --with-cov --cov Pweave --cov-config .coveragerc --logging-level=INFO
 
-# Calculate coverage
 after_success:
    - coveralls
-#  - coveralls --config_file .coveragerc
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 4bd07e0..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-markdown
-pygments
-ipython
-nbformat
-nbconvert
-jupyter_client
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 1cbda4a..801a4cb 100644
--- a/setup.py
+++ b/setup.py
@@ -35,10 +35,18 @@ def read(fname):
       author_email='matti.pastell@helsinki.fi',
       url='http://mpastell.com/pweave',
       packages=['pweave', 'pweave.themes', 'pweave.formatters', 'pweave.processors', 'pweave.bokeh'],
-      install_requires = ['markdown', 'pygments', 'ipython', 'nbformat',
-                          'nbconvert', 'jupyter_client', 'ipykernel'],
-      extras_require = {'test': ['scipy', 'matplotlib', 'coverage',
-                                   'ipython', 'nose', 'notebook'],
+      install_requires = ['markdown',
+                          'pygments',
+                          'ipython<=6.2.0',
+                          'nbformat',
+                          'nbconvert',
+                          'jupyter_client',
+                          'ipykernel'],
+      extras_require = {'test': ['scipy',
+                                 'matplotlib',
+                                 'coverage',
+                                 'nose',
+                                 'notebook'],
                         'doc' : ['sphinx', 'sphinx_rtd_theme']},
       license='LICENSE.txt',
       long_description = read('README.rst'),