mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-06 11:35:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from minrk/ipykernel

Browse Source 
ipython_kernel is ipykernel
This commit is contained in:
Min RK 2015-05-08 13:45:41 -07:00
commit 7532e17f85
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jupyter_notebook/notebookapp.py
View File

@ -988,7 +988,7 @@ class NotebookApp(JupyterApp):
self.kernel_spec_manager.get_kernel_spec(NATIVE_KERNEL_NAME)
except NoSuchKernel:
try:
import ipython_kernel
import ipykernel
except ImportError:
self.log.warn("IPython kernel not available")
else:

2
requirements.txt
View File

@ -3,5 +3,5 @@
-e git+https://github.com/jupyter/jupyter_nbformat.git#egg=jupyter_nbformat
-e git+https://github.com/jupyter/jupyter_client.git#egg=jupyter_client
-e git+https://github.com/ipython/ipython.git#egg=ipython
-e git+https://github.com/ipython/ipython_kernel.git#egg=ipython_kernel
-e git+https://github.com/ipython/ipykernel.git#egg=ipykernel
-e git+https://github.com/jupyter/nbconvert.git#egg=nbconvert

2
setup.py
View File

@ -148,7 +148,7 @@ install_requires = [
'jupyter_client',
'jupyter_nbformat',
'nbconvert',
'ipython_kernel', # bless IPython kernel for now
'ipykernel', # bless IPython kernel for now
]
extras_require = {
':sys_platform != "win32"': ['terminado>=0.3.3'],