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 #8175 from minrk/bigsplit-kernel

Browse Source 
Big Split: IPython.kernel
This commit is contained in:
Min RK 2015-03-28 12:01:02 -07:00
commit 8a3f13ae02
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IPython/testing/iptest.py
View File

@ -172,6 +172,8 @@ class TestSection(object):
shims = { shims = {
'parallel': 'ipython_parallel', 'parallel': 'ipython_parallel',
'kernel': 'ipython_kernel',
'kernel.inprocess': 'ipython_kernel.inprocess',
} }
# Name -> (include, exclude, dependencies_met) # Name -> (include, exclude, dependencies_met)
@ -230,10 +232,10 @@ sec.requires('zmq')
# The in-process kernel tests are done in a separate section # The in-process kernel tests are done in a separate section
sec.exclude('inprocess') sec.exclude('inprocess')
# importing gtk sets the default encoding, which we want to avoid # importing gtk sets the default encoding, which we want to avoid
sec.exclude('zmq.gui.gtkembed') sec.exclude('gui.gtkembed')
sec.exclude('zmq.gui.gtk3embed') sec.exclude('gui.gtk3embed')
if not have['matplotlib']: if not have['matplotlib']:
sec.exclude('zmq.pylab') sec.exclude('pylab')
# kernel.inprocess: # kernel.inprocess:
test_sections['kernel.inprocess'].requires('zmq') test_sections['kernel.inprocess'].requires('zmq')

2
setupbase.py
View File

@ -204,7 +204,7 @@ def find_package_data():
# 'v3/nbformat.v3.schema.json', # 'v3/nbformat.v3.schema.json',
# 'v4/nbformat.v4.schema.json', # 'v4/nbformat.v4.schema.json',
# ], # ],
'IPython.kernel': ['resources/*.*'], # 'IPython.kernel': ['resources/*.*'],
} }
return package_data return package_data