Merge pull request #2186 from cqmckay/oct2pydocfix

removed references to h5py dependence in octave magic docs closes #2173
ipython · Jul 21, 2012 · 1e0263d · 1e0263d
2 parents f5593ac + 88c020f
commit 1e0263d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/IPython/extensions/octavemagic.py b/IPython/extensions/octavemagic.py
@@ -8,8 +8,8 @@
 
 .. note::
 
-  The ``oct2py`` module needs to be installed separately, and in turn depends
-  on ``h5py``.  Both can be obtained using ``easy_install`` or ``pip``.
+  The ``oct2py`` module needs to be installed separately and
+  can be obtained using ``easy_install`` or ``pip``.
 
 Usage
 =====

diff --git a/docs/examples/notebooks/octavemagic_extension.ipynb b/docs/examples/notebooks/octavemagic_extension.ipynb
@@ -27,7 +27,7 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "The `octavemagic` extension provides the ability to interact with Octave.  It depends on the `oct2py` and `h5py` packages,\n",
+      "The `octavemagic` extension provides the ability to interact with Octave.  It depends on the `oct2py` package,\n",
       "which may be installed using `easy_install`.\n",
       "\n",
       "To enable the extension, load it as follows:"

diff --git a/docs/source/whatsnew/version0.13.txt b/docs/source/whatsnew/version0.13.txt
@@ -304,7 +304,7 @@ extremely useful.  The following extensions are provided:
     or whole blocks of Octave code, capture both output and figures inline
     (just like matplotlib plots), and have variables automatically converted
     between the two languages.  To use this extension, you must have Octave
-    installed as well as the oct2py_ and h5py_ packages.  The examples
+    installed as well as the oct2py_ package.  The examples
     directory in the source distribution ships with a full notebook
     demonstrating these capabilities:
 
@@ -316,7 +316,6 @@ extremely useful.  The following extensions are provided:
 
 .. _octave: http://www.gnu.org/software/octave
 .. _oct2py: http://pypi.python.org/pypi/oct2py
-.. _h5py: http://code.google.com/p/h5py
 
 **R magics** (extension :ref:`rmagic <extensions_rmagic>`)
     This extension provides several magics that support calling code written in