Merge branch 'master' into 'master'

let setuptools determine the base install path on OSX

This is the last commit from me before the 0.4.0 release.  Its ready to go!

A gentle reminder:
* sign the tag: `git tag -s 0.4.0 -m "tagging release 0.4.0"`
* release tags are `0.4.0` format, not `v0.4.0`
* change the version in `setup.py` to match the tag exactly, char by char

Then I'll post the update to pypi.python.org

See merge request !59

diff --git a/setup.py b/setup.py
index 12cf73d3be41c228cfc7d871df5ae59756a7b40b..043d899eed1bfcd001d016e6d3a6b2753f128a34 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,9 +3,9 @@
 from setuptools import setup
 import sys
 
-# workaround issue with easy_install on OSX, where sys.prefix is not an installable location
+# workaround issue on OSX, where sys.prefix is not an installable location
 if sys.platform == 'darwin' and sys.prefix.startswith('/System'):
-    data_prefix = '/Library/Python/2.7/site-packages'
+    data_prefix = '.'
 else:
     data_prefix = sys.prefix