Merge branch 'master' into parallel_vec

1 files changed, 50 insertions, 50 deletions

diff --git a/python/builder.py b/python/builder.py
index dcd62d8..ec0bd23 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -3,7 +3,7 @@
 #            2013-2016, CWI, Amsterdam
 #
 # Contact: astra@uantwerpen.be
-# Website: http://sf.net/projects/astra-toolbox
+# Website: http://www.astra-toolbox.com/
 #
 # This file is part of the ASTRA Toolbox.
 #
@@ -21,72 +21,72 @@
 # You should have received a copy of the GNU General Public License
 # along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #
-#-----------------------------------------------------------------------
+# -----------------------------------------------------------------------
 
-import sys
 import os
 import numpy as np
 
-from distutils.version import LooseVersion
 from distutils.core import setup
-from distutils.extension import Extension
+from pkg_resources import parse_version
 
 from Cython.Distutils import build_ext
 from Cython.Build import cythonize
 import Cython
-if LooseVersion(Cython.__version__)<LooseVersion('0.13'): raise ImportError("Cython version should be at least 0.13")
-usecuda=False
-try:
-    if os.environ['CPPFLAGS'].find('-DASTRA_CUDA')!=-1:
-        usecuda=True
-except KeyError:
-    pass
-try:
-    if os.environ['CL'].find('/DASTRA_CUDA')!=-1:
-        usecuda=True
-except KeyError:
-    pass
+if parse_version(Cython.__version__) < parse_version('0.13'):
+    raise ImportError('Cython version should be at least 0.13')
+
+use_cuda = ('-DASTRA_CUDA' in os.environ.get('CPPFLAGS', '') or
+            '/DASTRA_CUDA' in os.environ.get('CL', ''))
 
+self_path = os.path.dirname(os.path.abspath(__file__))
 
-cfgToWrite = 'DEF HAVE_CUDA=' + str(usecuda) + "\n"
-cfgHasToBeUpdated = True
+cfg_string = 'DEF HAVE_CUDA=' + str(use_cuda) + '\n'
+update_cfg = True
 try:
-    cfg = open('astra/config.pxi','r')
-    cfgIn = cfg.read()
-    cfg.close()
-    if cfgIn==cfgToWrite:
-        cfgHasToBeUpdated = False
+    with open(os.path.join(self_path, 'astra', 'config.pxi'), 'r') as cfg:
+        cfg_fromfile = cfg.read()
+    if cfg_fromfile == cfg_string:
+        update_cfg = False
 except IOError:
     pass
 
-if cfgHasToBeUpdated:
-    cfg = open('astra/config.pxi','w')
-    cfg.write(cfgToWrite)
-    cfg.close()
+if update_cfg:
+    with open(os.path.join(self_path, 'astra', 'config.pxi'), 'w') as cfg:
+        cfg.write(cfg_string)
+
+pkgdata = {}
+if os.environ.get('ASTRA_INSTALL_LIBRARY_AS_DATA', ''):
+    pkgdata['astra'] = [os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']]
 
-cmdclass = { }
-ext_modules = [ ]
+cmdclass = {}
+ext_modules = []
 
-ext_modules = cythonize("astra/*.pyx", language_level=2)
-cmdclass = { 'build_ext': build_ext }
+ext_modules = cythonize(os.path.join(self_path, 'astra', '*.pyx'),
+                        language_level=2)
+cmdclass = {'build_ext': build_ext}
 
 for m in ext_modules:
-  if m.name == 'astra.plugin_c':
-    m.sources.append('astra/src/PythonPluginAlgorithm.cpp')
+    if m.name == 'astra.plugin_c':
+        m.sources.append(os.path.join(self_path, 'astra', 'src',
+                                      'PythonPluginAlgorithm.cpp'))
 
-setup (name = 'PyASTRAToolbox',
-       version = '1.7.1',
-       description = 'Python interface to the ASTRA-Toolbox',
-       author='D.M. Pelt',
-       author_email='D.M.Pelt@cwi.nl',
-       url='http://sf.net/projects/astra-toolbox',
-       #ext_package='astra',
-       #ext_modules = cythonize(Extension("astra/*.pyx",extra_compile_args=extra_compile_args,extra_linker_args=extra_compile_args)),
-       license='GPLv3',
-       ext_modules = ext_modules,
-       include_dirs=[np.get_include()],
-       cmdclass = cmdclass,
-       #ext_modules = [Extension("astra","astra/astra.pyx")],
-       packages=['astra'],
-       requires=["numpy"],
-	)
+setup(name='astra-toolbox',
+      version='1.8',
+      description='Python interface to the ASTRA Toolbox',
+      author='D.M. Pelt',
+      author_email='D.M.Pelt@cwi.nl',
+      url='https://github.com/astra-toolbox/astra-toolbox',
+      # ext_package='astra',
+      # ext_modules = cythonize(
+      #     Extension("astra/*.pyx",
+      #               extra_compile_args=extra_compile_args,
+      #               extra_linker_args=extra_compile_args)),
+      license='GPLv3',
+      ext_modules=ext_modules,
+      include_dirs=[np.get_include()],
+      cmdclass=cmdclass,
+      # ext_modules = [Extension("astra","astra/astra.pyx")],
+      packages=['astra', 'astra.plugins'],
+      package_data=pkgdata,
+      requires=['numpy', 'scipy', 'six'],
+      )