Update distutils for openmp and new version of pip

distutils.ext/obidistutils/core.py

@@ -9,12 +9,12 @@ import os.path
 import glob
 import sys
 
-# try:
-#     from setuptools.extension import Extension
-# except ImportError:
-#     from distutils.extension import Extension
+try:
+    from setuptools.extension import Extension
+except ImportError:
+    from distutils.extension import Extension
 
-from distutils.extension import Extension
+# from distutils.extension import Extension
 
 from obidistutils.serenity.checkpackage import  install_requirements,\
                                                 check_requirements, \
@@ -40,7 +40,6 @@ def findPackage(root,base=None):
     
 def findCython(root,base=None,pyrexs=None):
     setupdir = os.path.dirname(sys.argv[0])
-    csourcedir = os.path.join(setupdir,"src")
     pyrexs=[]
 
     if base is None:
@@ -54,7 +53,6 @@ def findCython(root,base=None,pyrexs=None):
                                     [pyrex]
                                     )
                           )
-            pyrexs[-1].include_dirs.append(csourcedir)
             try:
                 cfiles = os.path.splitext(pyrex)[0]+".cfiles"
                 cfilesdir = os.path.dirname(cfiles)
@@ -72,7 +70,7 @@ def findCython(root,base=None,pyrexs=None):
                                                       '-Wno-unused-function',
                                                       '-Wmissing-braces',
                                                       '-Wchar-subscripts'])
-                
+                                
             except IOError:
                 pass
             
@@ -225,4 +223,4 @@ def setup(**attrs):
 
     from distutils.core import setup as ori_setup
     
-    ori_setup(**attrs)
+    return ori_setup(**attrs)