Changeset 0e4e554 in sasview for setup.py

Timestamp:

Feb 18, 2015 9:48:12 AM (10 years ago)

Author:

ajj

Branches:

master, ESS_GUI, ESS_GUI_Docs, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

dea7cb4

Parents:

6f82ba1

Message:

start switching to sasmodels including dispersion

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -260 +260 @@
 model_dir = os.path.join("src", "sas","models")
 
-if os.path.isdir(wrapper_dir):
-    for file in os.listdir(wrapper_dir): 
-        file_path =  os.path.join(wrapper_dir, file)
-        os.remove(file_path)
-else:
-    os.makedirs(wrapper_dir)
-sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
-from wrapping import generate_wrappers
-generate_wrappers(header_dir = includedir, 
-                  output_dir = model_dir,
-                  c_wrapper_dir = wrapper_dir)
+#if os.path.isdir(wrapper_dir):
+#    for file in os.listdir(wrapper_dir):
+#        file_path =  os.path.join(wrapper_dir, file)
+#        os.remove(file_path)
+#else:
+#    os.makedirs(wrapper_dir)
+#sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
+#from wrapping import generate_wrappers
+#generate_wrappers(header_dir = includedir,
+#                  output_dir = model_dir,
+#                  c_wrapper_dir = wrapper_dir)
 
 IGNORED_FILES = [".svn"]
@@ -299 +299 @@
 model_sources = []
 append_file(file_list=model_sources, dir_path=igordir)
-append_file(file_list=model_sources, dir_path=c_model_dir)
-append_file(file_list=model_sources, dir_path=wrapper_dir)
+#append_file(file_list=model_sources, dir_path=c_model_dir)
+#append_file(file_list=model_sources, dir_path=wrapper_dir)
 
 smear_sources = []
@@ -319 +319 @@
 
 c_models = [ 
-    Extension("sas.models.sas_extension.c_models",
-        sources=model_sources,                 
-        include_dirs=[
-            igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
-        ],
-    ),
+    #Extension("sas.models.sas_extension.c_models",
+    #    sources=model_sources,
+    #    include_dirs=[
+    #        igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
+    #    ],
+    #),
 
     # Smearer extension
@@ -356 +356 @@
 ext_modules.extend(c_models)
 
+packages.append("sas.models")
 # SasView