Merge branch 'release/0.0.8'

.gitignore

@@ -6,3 +6,4 @@ build
 *.pyc
 dist
 pyemd.egg-info
+*.cpp

.travis.yml

@@ -0,0 +1,10 @@
+language: python
+python:
+  - "3.2"
+  - "3.3"
+# Install dependencies
+install: 
+  - python setup.py install
+  - pip install pytest
+# Run tests
+script: py.test

Makefile

@@ -1,7 +1,7 @@
 buildcython:
 	cython -v -t --cplus pyemd/emd.pyx
 	python setup.py build_ext --inplace
-	mv emd.so pyemd
+	mv emd.cpython-34m.so pyemd/emd.so
 
 clean:
 	rm -rf pyemd/emd.so

README.rst

@@ -1,6 +1,8 @@
 **************************
 PyEMD: Fast EMD for Python
 **************************
+.. image:: https://travis-ci.org/wmayner/pyemd.svg?branch=develop
+    :target: https://travis-ci.org/wmayner/pyemd
 
 PyEMD is a Python wrapper for `Ofir Pele and Michael Werman's implementation
 <http://www.seas.upenn.edu/~ofirpele/FastEMD/code/>`_ of the `Earth Mover's
@@ -17,18 +19,22 @@ Installation
 
 To install the latest release:
 
+.. code:: bash
+
     pip install pyemd
 
 To install the latest development version:
 
+.. code:: bash
+
     pip install "git+https://github.com/wmayner/pyemd@develop#egg=pyemd"
 
 Usage
 ~~~~~
 
 Use PyEMD like so:
 
-.. code-block:: python
+.. code:: python
 
     >>> from pyemd import emd
     >>> import numpy as np
@@ -41,7 +47,7 @@ Use PyEMD like so:
 API
 ~~~
 
-.. code-block:: python
+.. code:: python
 
     emd(first_signature, second_signature, distance_matrix)
 
@@ -65,6 +71,8 @@ Limitations and Caveats
 - The original C++ functions have optional parameters ``extra_mass_penalty``
   and ``F`` (for flows); this wrapper does not expose those parameters. See
   the documentation in **pyemd/lib/emd_hat.hpp**.
+- You may get segfaults if you pass bad arguments. Input is not validated, for
+  a (probably negligible) speed boost!
 
 
 Contributing

pyemd/__init__.py

@@ -50,7 +50,7 @@
 """
 
 __title__ = 'pyemd'
-__version__ = '0.0.7'
+__version__ = '0.0.8'
 __author__ = 'Will Mayner'
 __author_email__ = 'wmayner@gmail.com'
 __author_website__ = 'http://willmayner.com'