From 440a8f789546146bd16bde2ec912e8c39ac4a7f1 Mon Sep 17 00:00:00 2001 From: Simon Gibbons Date: Mon, 30 Mar 2015 14:50:48 +0100 Subject: [PATCH 1/4] Bumped version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9929d9d..6fe0e3c 100644 --- a/setup.py +++ b/setup.py @@ -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="sljg2@ast.cam.ac.uk", From 7dd36e8870fb37a08c45532b3394070beda625a6 Mon Sep 17 00:00:00 2001 From: Simon Gibbons Date: Mon, 30 Mar 2015 14:52:59 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c47dd95..8573409 100644 --- a/README.md +++ b/README.md @@ -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=/home/sljg2/software/include +``` + +and then running the above command. ## Examples @@ -51,4 +57,4 @@ plt.show() ### A more complicated example -![stream_example](/../screenshots/img/stream_example.png) \ No newline at end of file +![stream_example](/../screenshots/img/stream_example.png) From f10418d529f38e6047be1498c3ad8fce66004660 Mon Sep 17 00:00:00 2001 From: Simon Gibbons Date: Mon, 30 Mar 2015 14:53:23 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8573409..c1cec15 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ directory. This can be done by creating a file in your home directory called ``` [build_ext] -include_dirs=/home/sljg2/software/include +include_dirs=/path/to/boost/include/directory ``` and then running the above command. From a154d60b541e020906062318a2f76d380edf1ac1 Mon Sep 17 00:00:00 2001 From: Simon Gibbons Date: Mon, 30 Mar 2015 17:45:17 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1cec15..275fb67 100644 --- a/README.md +++ b/README.md @@ -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/)