Upgrade aksetup, README bits.

inducer · Mar 21, 2013 · f82af0a · f82af0a
1 parent d327e63
commit f82af0a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/README.rst b/README.rst
@@ -0,0 +1,16 @@
+TagPy is a set of Python bindings for Scott Wheeler's 
+`TagLib <http://developer.kde.org/~wheeler/taglib.html>`_. 
+It builds upon `Boost.Python <http://www.boost.org/libs/python/doc/>`_, 
+a wrapper generation library which is part of the renowned Boost 
+set of C++ libraries.
+
+Just like TagLib, TagPy can:
+
+* read and write ID3 tags of version 1 and 2, with many supported frame types
+  for version 2 (in MPEG Layer 2 and MPEG Layer 3, FLAC and MPC),
+* access Xiph Comments in Ogg Vorbis Files and Ogg Flac Files,
+* access APE tags in Musepack and MP3 files.
+
+All these features have their own specific interfaces, but 
+TagLib's generic tag reading and writing mechanism is also 
+supported. It comes with a bunch of examples.
diff --git a/aksetup_helper.py b/aksetup_helper.py
@@ -85,17 +85,8 @@ def del_include_dirs(self):
 
 class PyUblasExtension(NumpyExtension):
     def get_module_include_path(self, name):
-        from imp import find_module
-        file, pathname, descr = find_module(name)
-        from os.path import join, exists
-        installed_path = join(pathname, "..", "include")
-        development_path = join(pathname, "..", "src", "cpp")
-        if exists(installed_path):
-            return installed_path
-        elif exists(development_path):
-            return development_path
-        else:
-            raise RuntimeError("could not find C include path for module '%s'" % name)
+        from pkg_resources import Requirement, resource_filename
+        return resource_filename(Requirement.parse(name), "%s/include" % name)
 
     @property
     def include_dirs(self):

diff --git a/setup.py b/setup.py
@@ -57,24 +57,7 @@ def main():
     setup(name="tagpy",
           version="2013.1",
           description="Python Bindings for TagLib",
-          long_description="""
-          TagPy is a set of Python bindings for Scott Wheeler's 
-          `TagLib <http://developer.kde.org/~wheeler/taglib.html>`_. 
-          It builds upon `Boost.Python <http://www.boost.org/libs/python/doc/>`_, 
-          a wrapper generation library which is part of the renowned Boost 
-          set of C++ libraries.
-
-          Just like TagLib, TagPy can:
-
-          * read and write ID3 tags of version 1 and 2, with many supported frame types
-            for version 2 (in MPEG Layer 2 and MPEG Layer 3, FLAC and MPC),
-          * access Xiph Comments in Ogg Vorbis Files and Ogg Flac Files,
-          * access APE tags in Musepack and MP3 files.
-
-          All these features have their own specific interfaces, but 
-          TagLib's generic tag reading and writing mechanism is also 
-          supported. It comes with a bunch of examples.
-          """,
+          long_description=open("README.rst", "rt").read(),
           author="Andreas Kloeckner",
           author_email="inform@tiker.net",
           classifiers=