Merge pull request #96 from takluyver/no-detect-venv

Don't try to detect virtualenvs when starting a kernel

ipykernel/zmqshell.py

@@ -487,14 +487,17 @@ def set_parent(self, parent):
     def get_parent(self):
         return self.parent_header
 
-    #-------------------------------------------------------------------------
-    # Things related to magics
-    #-------------------------------------------------------------------------
-
     def init_magics(self):
         super(ZMQInteractiveShell, self).init_magics()
         self.register_magics(KernelMagics)
         self.magics_manager.register_alias('ed', 'edit')
 
+    def init_virtualenv(self):
+        # Overridden not to do virtualenv detection, because it's probably
+        # not appropriate in a kernel. To use a kernel in a virtualenv, install
+        # it inside the virtualenv.
+        # http://ipython.readthedocs.org/en/latest/install/kernel_install.html
+        pass
+
 
 InteractiveShellABC.register(ZMQInteractiveShell)