Merge pull request #5497 from takluyver/rm-octavemagic

Remove the octavemagic extension.

docs/source/whatsnew/pr/incompat-rm-octavemagic.rst

@@ -0,0 +1,1 b''
+* Removed the octavemagic extension: it is now available as ``oct2py.ipython``.

IPython/testing/iptest.py

@@ -143,7 +143,6 b" 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', (3,1,0), callback=None)
 have['jinja2'] = test_for('jinja2')
 have['requests'] = test_for('requests')
@@ -250,9 +249,6 b" sec = test_sections['extensions']"
 if not have['cython']:
     sec.exclude('cythonmagic')
     sec.exclude('tests.test_cythonmagic')
-if not have['oct2py']:
-    sec.exclude('octavemagic')
-    sec.exclude('tests.test_octavemagic')
 if not have['rpy2'] or not have['numpy']:
     sec.exclude('rmagic')
     sec.exclude('tests.test_rmagic')

docs/source/config/extensions/index.rst

@@ -84,7 +84,9 b' Extensions bundled with IPython'
 
    autoreload
    cythonmagic
-   octavemagic
    rmagic
    storemagic
    sympyprinting
+
+* ``octavemagic`` used to be bundled, but is now part of `oct2py <http://blink1073.github.io/oct2py/docs/>`_.
+  Use ``%load_ext oct2py.ipython`` to load it.

docs/source/whatsnew/version0.13.rst

@@ -298,7 +298,7 b' extremely useful. The following extensions are provided:'
 
 .. _cython: http://cython.org
 
-**Octave magics** (extension :ref:`octavemagic <extensions_octavemagic>`)
+**Octave magics** (extension ``octavemagic``)
     This extension provides several magics that support calling code written in
     the Octave_ language for numerical computing.  You can execute single-lines
     or whole blocks of Octave code, capture both output and figures inline