mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8188 from minrk/bigsplit-traitlets

Browse Source 
Big Split: traitlets, config
This commit is contained in:
Thomas Kluyver 2015-03-29 16:28:51 -07:00
commit 611c5df298
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/html/widgets/tests/test_traits.py
View File

@ -5,7 +5,7 @@
from unittest import TestCase from unittest import TestCase
from IPython.utils.traitlets import HasTraits from IPython.utils.traitlets import HasTraits
from IPython.utils.tests.test_traitlets import TraitTestBase from traitlets.tests.test_traitlets import TraitTestBase
from IPython.html.widgets import Color from IPython.html.widgets import Color

5
IPython/testing/iptest.py
View File

@ -174,6 +174,7 @@ shims = {
'parallel': 'ipython_parallel', 'parallel': 'ipython_parallel',
'kernel': 'ipython_kernel', 'kernel': 'ipython_kernel',
'kernel.inprocess': 'ipython_kernel.inprocess', 'kernel.inprocess': 'ipython_kernel.inprocess',
'config': 'traitlets',
} }
# Name -> (include, exclude, dependencies_met) # Name -> (include, exclude, dependencies_met)
@ -270,10 +271,6 @@ if not have['pygments'] or not have['jinja2']:
if not have['terminado']: if not have['terminado']:
sec.exclude('terminal') sec.exclude('terminal')
# config:
# Config files aren't really importable stand-alone
test_sections['config'].exclude('profile')
# nbconvert: # nbconvert:
sec = test_sections['nbconvert'] sec = test_sections['nbconvert']
sec.requires('pygments', 'jinja2', 'jsonschema', 'mistune') sec.requires('pygments', 'jinja2', 'jsonschema', 'mistune')