Merge branch 'devel' of github.com:biosustain/cameo into devel

.travis.yml

@@ -20,6 +20,8 @@ install:
   - if [[ $TRAVIS_PYTHON_VERSION == "3.4" ]]; then pip install pyzmq pandas; fi
   - if [[ $TRAVIS_PYTHON_VERSION == "3.4" ]]; then pip install -e git+https://github.com/coagulant/progressbar-python3.git#egg=progressbar; fi
   - if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then pip install progressbar-ipython>=2.3.1; fi
+  # Install escher from repo until 1.1.1 get's released
+  - pip install -e git+https://github.com/zakandrewking/escher.git@9d8dd5ff91c783ca51176987ac71a8e330686760#egg=escher
   - pip install python-libsbml-experimental numpy scipy pyzmq pandas inspyred -f https://dl.dropboxusercontent.com/u/22461024/pypi.drosophi.la/index.html --no-index
   - pip install coveralls coverage
   - pip install redis

cameo/visualization/visualization.py

@@ -25,14 +25,15 @@
 from functools import partial
 from io import BytesIO
 
-from cameo.util import in_ipnb
 import networkx as nx
+from escher import Builder
 
 import os
-from cameo.util import TimeMachine
+from cameo.util import TimeMachine, in_ipnb
 import cameo
 
 
+
 log = logging.getLogger(__name__)
 
 import collections
@@ -131,7 +132,6 @@ def pathviz_cdf(map_id='EcoliCore_coreMap', **kwargs):
 
 
 def draw_knockout_result(model, map_name, simulation_method, knockouts, *args, **kwargs):
-    from escher import Builder
     tm = TimeMachine()
 
     try: