Changeset 3010f68 in sasview for setup.py

Timestamp:

May 29, 2018 8:45:04 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

eca7c6f

Parents:

9a7c81c

Message:

Cherrypicked (from master) commits for C++ → C conversion in the SLD calculator.

File:

• setup.py (modified) (6 diffs)

setup.py

@@ -17 +17 @@
 import numpy as np
 from setuptools import Extension, setup
+
+try:
+    import tinycc.distutils
+except ImportError:
+    pass
 
 # Manage version number ######################################
@@ -198 +203 @@
 
 # sas module
-#package_dir["sas.sasgui"] = os.path.join("src", "sas", "sasgui")
-#packages.append("sas.sasgui")
-
 # qt module
 package_dir["sas.qtgui"] = os.path.join("src", "sas", "qtgui")
@@ -214 +216 @@
 packages.extend(["sas.sascalc.invariant"])
 
-# sas.sasgui.guiframe
-# guiframe_path = os.path.join("src", "sas", "sasgui", "guiframe")
-# package_dir["sas.sasgui.guiframe"] = guiframe_path
-# package_dir["sas.sasgui.guiframe.local_perspectives"] = os.path.join(
-#     os.path.join(guiframe_path, "local_perspectives"))
-# package_data["sas.sasgui.guiframe"] = ['images/*', 'media/*']
-# packages.extend(
-#     ["sas.sasgui.guiframe", "sas.sasgui.guiframe.local_perspectives"])
-# # build local plugin
-# for d in os.listdir(os.path.join(guiframe_path, "local_perspectives")):
-#     if d not in ['.svn', '__init__.py', '__init__.pyc']:
-#         package_name = "sas.sasgui.guiframe.local_perspectives." + d
-#         packages.append(package_name)
-#         package_dir[package_name] = os.path.join(
-#             guiframe_path, "local_perspectives", d)
 
 # sas.sascalc.dataloader
@@ -246 +233 @@
 ext_modules.append(Extension("sas.sascalc.calculator.core.sld2i",
                              sources=[
-                                 os.path.join(gen_dir, "sld2i_module.cpp"),
-                                 os.path.join(gen_dir, "sld2i.cpp"),
+                                 os.path.join(gen_dir, "sld2i_module.c"),
+                                 os.path.join(gen_dir, "sld2i.c"),
                                  os.path.join(gen_dir, "libfunc.c"),
                                  os.path.join(gen_dir, "librefl.c"),
@@ -280 +267 @@
                              include_dirs=[np.get_include()],
                              ))
+
 # sas.sascalc.corfunc
 package_dir["sas.sascalc.corfunc"] = os.path.join(
     "src", "sas", "sascalc", "corfunc")
+
 packages.extend(["sas.sascalc.corfunc"])
 
@@ -466 +455 @@
 
 required = [
-    'bumps>=0.7.5.9', 'periodictable>=1.5.0',
+    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0',
     'lxml', 'h5py',