Skip to content

Commit

Permalink
Merge branch 'master' of github.com:simongibbons/pyfof
Browse files Browse the repository at this point in the history
  • Loading branch information
simongibbons committed Mar 30, 2015
2 parents faebb75 + a154d60 commit 700505c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ accelerated with an R*-tree.

## Requirements
* c++11 complient compiler
* [Cython](http://cython.org/)
* [Cython](http://cython.org/) (for the development version only)
* [numpy](http://www.numpy.org/)
* [boost](http://www.boost.org/)

Expand All @@ -20,9 +20,15 @@ the latest release of the package directly from PyPI
```pip install pyfof```

If that fails then you will need to tell pip where to find your boost include
directory
directory. This can be done by creating a file in your home directory called
```.pydistutils.cfg``` containing:

```pip install pyfof --install-option="--include /path/to/boost/include/dir"```
```
[build_ext]
include_dirs=/path/to/boost/include/directory
```

and then running the above command.

## Examples

Expand Down Expand Up @@ -51,4 +57,4 @@ plt.show()

### A more complicated example

![stream_example](/../screenshots/img/stream_example.png)
![stream_example](/../screenshots/img/stream_example.png)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def build_extension(self, ext):
extensions = cythonize(extensions)

setup( name = "pyfof",
version="0.1-dev",
version="0.2-dev",
description="Friends-of-friends cluster finding in python",
author="Simon Gibbons",
author_email="[email protected]",
Expand Down

0 comments on commit 700505c

Please sign in to comment.