Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

removed references to h5py dependence in octave magic documentation #2186

Merged
merged 2 commits into from

2 participants

@cqmckay

There were two spots that I found: the version 0.13 file in the whatsnew directory, and the octavemagic_extension notebook. If there are others I've missed, I'd be happy to go back and fix those too.

closes #2173

@minrk
Owner

one more in IPython/extensions/octavemagic.py

@minrk minrk merged commit 1e0263d into ipython:master
@minrk minrk referenced this pull request from a commit
@minrk minrk Backport PR #2186: removed references to h5py dependence in octave ma…
…gic documentation

There were two spots that I found: the version 0.13 file in the whatsnew directory, and the octavemagic_extension notebook.  If there are others I've missed, I'd be happy to go back and fix those too.

closes #2173
01e35e5
@yarikoptic yarikoptic referenced this pull request from a commit in yarikoptic/ipython
@yarikoptic yarikoptic Merge commit 'rel-0.13-33-gcfc5692' into debian-01X
* commit 'rel-0.13-33-gcfc5692': (33 commits)
  Backport PR #2347: adjust division error message checking to account for Python 3
  Backport PR #2305: RemoteError._render_traceback_ calls self.render_traceback
  Backport PR #2280: fix SSH passwordless check for OpenSSH
  Backport PR #2270: SSHLauncher tweaks
  Backport PR #2261: Fix: longest_substr([]) -> ''
  Backport PR #2250: fix html in notebook example
  Backport PR #2235: remove spurious print statement from setupbase.py
  fixup
  Backport PR #2223: Custom tracebacks
  Backport PR #2214: use KernelApp.exec_lines/files in IPEngineApp
  Backport PR #2212: catch errors in markdown javascript
  Backport PR #2194: clean nan/inf in json_clean
  Backport PR #2177: remove numpy install from travis/tox scripts
  Backport PR #2169: ipdb: pdef, pdoc, pinfo magics all broken
  Backport PR #2186: removed references to h5py dependence in octave magic documentation
  Backport PR #2185: added test for %store, fixed storemagic
  Backport PR #2170: Fix tab completion with IPython.embed_kernel().
  Backport PR #2163: fix 'remote_profie_dir' typo in SSH launchers
  Backport PR #2117: use explicit url in notebook example
  Backport PR #2126: ipcluster broken with any batch (PBS/LSF/SGE)
  ...
fc7c7f5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
4 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
=====
View
2  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:"
View
3  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
Something went wrong with that request. Please try again.