mirror of
https://github.com/jupyter/notebook.git
synced 2024-12-21 04:10:17 +08:00
Merge pull request #1849 from stefanv/octavemagic
Add %%octave, %octave, %octave_pull and %octave_push magics to facilitate interaction with Octave via oct2py. This is similar in spirit to the R magic extension.
This commit is contained in:
commit
d81197455a
@ -157,6 +157,7 @@ have['qt'] = test_for('IPython.external.qt')
|
||||
have['rpy2'] = test_for('rpy2')
|
||||
have['sqlite3'] = test_for('sqlite3')
|
||||
have['cython'] = test_for('Cython')
|
||||
have['oct2py'] = test_for('oct2py')
|
||||
have['tornado'] = test_for('tornado.version_info', (2,1,0), callback=None)
|
||||
have['wx'] = test_for('wx')
|
||||
have['wx.aui'] = test_for('wx.aui')
|
||||
@ -284,6 +285,10 @@ def make_exclude():
|
||||
exclusions.extend([ipjoin('extensions', 'cythonmagic')])
|
||||
exclusions.extend([ipjoin('extensions', 'tests', 'test_cythonmagic')])
|
||||
|
||||
if not have['oct2py']:
|
||||
exclusions.extend([ipjoin('extensions', 'octavemagic')])
|
||||
exclusions.extend([ipjoin('extensions', 'tests', 'test_octavemagic')])
|
||||
|
||||
if not have['tornado']:
|
||||
exclusions.append(ipjoin('frontend', 'html'))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user