Skip to content

Commit

Permalink
Fix requirements specification and add pygments to readme
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Dec 1, 2013
1 parent 04aa338 commit a49dd37
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Oct2py: Python to GNU Octave Bridge
:target: https://coveralls.io/r/blink1073/oct2py


Oct2py is a means to seemlessly call m-files and Octave functions from python.
Oct2py is a means to seemlessly call m-files and Octave functions from Python.
It manages the Octave session for you, sharing data behind the scenes using
MAT files. Usage is as simple as:

..
.. code-block:: python
>>> oc = oct2py.Oct2Py()
>>> x = oc.zeros(3,3)
Expand All @@ -32,15 +32,15 @@ trust a code translator, this is your library.
Features
--------

- Supports all Octave datatypes and most python datatypes and numpy dtypes.
- Supports all Octave datatypes and most Python datatypes and Numpy dtypes.
- Provides %octavemagic% for IPython, including inline plotting in notebooks.
- Supports cell arrays and structs with arbitrary nesting.
- Supports sparse matrices.
- Builds methods on the fly linked to Octave commands (e.g. `zeros` above).
- Nargout is automatically inferred by the number of return variables.
- Thread-safety: each Oct2Py object uses an independent Octave session.
- Can be used as a context manager.
- Supports unicode characters.
- Supports Unicode characters.


Installation
Expand All @@ -52,13 +52,13 @@ Additionally, you must have the numpy and scipy libraries installed.

To install Oct2py, simply:

..
.. code-block:: bash
$ pip install oct2py
Or, if you absolutely must:

..
.. code-block:: bash
$ easy_install oct2py
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
MAINTAINER_EMAIL = 'steven.silvester@ieee.org'
URL = 'http://github.com/blink1073/oct2py'
LICENSE = 'MIT'
REQUIRES = ["numpy (>= 1.6.0)", "scipy (>= 0.9.0)"]
REQUIRES = ["numpy >= 1.6.0", "scipy >= 0.9.0"]
PACKAGES = [DISTNAME, '{0}.tests'.format(DISTNAME)]
PACKAGE_DATA = {DISTNAME: ['tests/*.m']}
CLASSIFIERS = """\
Expand Down

0 comments on commit a49dd37

Please sign in to comment.