Merge pull request #578 from jhprinz/fix_conda_build

fix conda-build 2.0 problems

.travis.yml

@@ -18,7 +18,10 @@ script:
   - echo travis_fold:end:conda.build.package
 
   # Run tests in _test environment
-  - source activate _test
+  - conda create --yes --name test --use-local openpathsampling-dev
+  - conda info --envs
+  - source activate test
+  - conda install --yes jupyter nose nose-timer python-coveralls msmbuilder pyemma ipynbtest
   - source devtools/ci/git_hash.sh
   - source devtools/ci/nosetests.sh
   - source devtools/ci/ipythontests.sh

openpathsampling/tools.py

@@ -2,31 +2,37 @@
 
 __author__ = 'Jan-Hendrik Prinz'
 
-import IPython.display
-import IPython.terminal.interactiveshell
-import ipykernel.zmqshell
 
-
-def in_ipynb():
-    try:
-        ipython = get_ipython()
-
-        if isinstance(ipython, IPython.terminal.interactiveshell.TerminalInteractiveShell):
-            # we are running inside an IPYTHON console
+try:
+    import IPython
+    import IPython.display
+
+    def in_ipynb():
+        try:
+            ipython = get_ipython()
+
+            import IPython.terminal.interactiveshell
+            import ipykernel.zmqshell
+
+            if isinstance(ipython, IPython.terminal.interactiveshell.TerminalInteractiveShell):
+                # we are running inside an IPYTHON console
+                return False
+            elif isinstance(ipython, ipykernel.zmqshell.ZMQInteractiveShell):
+                # we run in an IPYTHON notebook
+                return True
+            else:
+                return False
+        except NameError:
+            # No IPYTHON
             return False
-        elif isinstance(ipython, ipykernel.zmqshell.ZMQInteractiveShell):
-            # we run in an IPYTHON notebook
-            return True
-        else:
+        except:
+            # No idea, but we should not fail because of that
             return False
-    except NameError:
-        # No IPYTHON
-        return False
-    except:
-        # No idea, but we should not fail because of that
-        return False
-
-is_ipynb = in_ipynb()
+
+    is_ipynb = in_ipynb()
+
+except ImportError:
+    is_ipynb = False
 
 
 def refresh_output(output_str, print_anyway=True, refresh=True,