Transition to package_data from data_files. Update aksetup.

inducer · Mar 14, 2013 · 5f5509a · 5f5509a
1 parent b576fa0
commit 5f5509a
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 14 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,6 @@
 include test/*.py
-include src/cpp/pyublasext/*.hpp
+
+include pyublasext/include/pyublasext/*.hpp
 
 include fortran/daskr/*.sh
 include fortran/daskr/*.f

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/src/cpp/pyublasext/arpack.hpp → pyublasext/include/pyublasext/arpack.hpp b/src/cpp/pyublasext/arpack.hpp → pyublasext/include/pyublasext/arpack.hpp
diff --git a/src/cpp/pyublasext/arpack_proto.hpp → ...asext/include/pyublasext/arpack_proto.hpp b/src/cpp/pyublasext/arpack_proto.hpp → ...asext/include/pyublasext/arpack_proto.hpp
diff --git a/src/cpp/pyublasext/bicgstab.hpp → pyublasext/include/pyublasext/bicgstab.hpp b/src/cpp/pyublasext/bicgstab.hpp → pyublasext/include/pyublasext/bicgstab.hpp
diff --git a/src/cpp/pyublasext/cg.hpp → pyublasext/include/pyublasext/cg.hpp b/src/cpp/pyublasext/cg.hpp → pyublasext/include/pyublasext/cg.hpp
diff --git a/src/cpp/pyublasext/daskr.hpp → pyublasext/include/pyublasext/daskr.hpp b/src/cpp/pyublasext/daskr.hpp → pyublasext/include/pyublasext/daskr.hpp
diff --git a/src/cpp/pyublasext/matrix_operator.hpp → ...xt/include/pyublasext/matrix_operator.hpp b/src/cpp/pyublasext/matrix_operator.hpp → ...xt/include/pyublasext/matrix_operator.hpp
diff --git a/src/cpp/pyublasext/umfpack.hpp → pyublasext/include/pyublasext/umfpack.hpp b/src/cpp/pyublasext/umfpack.hpp → pyublasext/include/pyublasext/umfpack.hpp
diff --git a/setup.py b/setup.py
@@ -72,7 +72,7 @@ def main():
     if conf["COMPILE_XERBLA"]:
         os.system("cd fortran/xerbla; ./build.sh")
 
-    INCLUDE_DIRS = ["src/cpp"] + conf["BOOST_INC_DIR"]
+    INCLUDE_DIRS = ["pyublasext/include"] + conf["BOOST_INC_DIR"]
 
     LIBRARY_DIRS = conf["BOOST_LIB_DIR"]
     LIBRARIES = conf["BOOST_PYTHON_LIBNAME"]
@@ -111,6 +111,12 @@ def handle_component(comp):
     handle_component("BLAS")
     handle_component("XERBLA")
 
+    try:
+        from distutils.command.build_py import build_py_2to3 as build_py
+    except ImportError:
+        # 2.x
+        from distutils.command.build_py import build_py
+
     setup(name="PyUblasExt",
           version="0.92.4",
           description="Added functionality for PyUblas",
@@ -169,8 +175,19 @@ def handle_component(comp):
               extra_compile_args=conf["CXXFLAGS"],
               extra_link_args=conf["LDFLAGS"],
               ), ],
+
           data_files=[("include/pyublasext", glob.glob("src/cpp/pyublasext/*.hpp"))],
-         )
+          include_package_data=True,
+          package_data={
+                  "pyublasext": [
+                      "include/pyublasext/*.hpp",
+                      ]
+                  },
+
+          zip_safe=False,
+
+          # 2to3 invocation
+          cmdclass={'build_py': build_py})