Changeset a62945e in sasview

Timestamp:

Mar 20, 2016 6:56:56 AM (9 years ago)

Author:

krzywon

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:

ad25dc2

Parents:

5a2695a

Message:

Code Cleanup - setup.py changes were not properly committed with last checkin.

File:

• setup.py (modified) (6 diffs)

setup.py

@@ -36 +36 @@
 # except when there is no such file
 # Todo : make this list generic
-plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py', 
-                     'sum_Ap1_1_Ap2.py', 'sum_p1_p2.py', 
-                     'testmodel_2.py', 'testmodel.py',
-                     'polynominal5.pyc', 'sph_bessel_jn.pyc', 
-                     'sum_Ap1_1_Ap2.pyc', 'sum_p1_p2.pyc', 
-                     'testmodel_2.pyc', 'testmodel.pyc', 'plugins.log']
+# plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py',
+#                      'sum_Ap1_1_Ap2.py', 'sum_p1_p2.py',
+#                      'testmodel_2.py', 'testmodel.py',
+#                      'polynominal5.pyc', 'sph_bessel_jn.pyc',
+#                      'sum_Ap1_1_Ap2.pyc', 'sum_p1_p2.pyc',
+#                      'testmodel_2.pyc', 'testmodel.pyc', 'plugins.log']
 sas_dir = os.path.join(os.path.expanduser("~"),'.sasview')
 if os.path.isdir(sas_dir):
@@ -53 +53 @@
     if os.path.isfile(f_path):
         os.remove(f_path)
-    f_path = os.path.join(sas_dir, 'plugin_models')
-    if os.path.isdir(f_path):
-        for f in os.listdir(f_path): 
-            if f in plugin_model_list:
-                file_path =  os.path.join(f_path, f)
-                os.remove(file_path)
+    # f_path = os.path.join(sas_dir, 'plugin_models')
+    # if os.path.isdir(f_path):
+    #     for f in os.listdir(f_path):
+    #         if f in plugin_model_list:
+    #             file_path =  os.path.join(f_path, f)
+    #             os.remove(file_path)
                     
 # 'sys.maxsize' and 64bit: Not supported for python2.5
@@ -226 +226 @@
 
 package_dir["sas.sasgui.perspectives.fitting"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting")
-package_dir["sas.sasgui.perspectives.fitting.plugin_models"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting", "plugin_models")
-packages.extend(["sas.sasgui.perspectives.fitting", 
-                 "sas.sasgui.perspectives.fitting.plugin_models"])
-package_data['sas.sasgui.perspectives.fitting'] = ['media/*','plugin_models/*']
+# package_dir["sas.sasgui.perspectives.fitting.plugin_models"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting", "plugin_models")
+packages.extend(["sas.sasgui.perspectives.fitting",#"sas.sasgui.perspectives.fitting.plugin_models"
+                 ])
+package_data['sas.sasgui.perspectives.fitting'] = ['media/*']
 
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])    
@@ -249 +249 @@
 smear_dir  = os.path.join("src", "sas", "models", "c_extension", "c_smearer")
 gen_dir  = os.path.join("src", "sas", "models", "c_extension", "c_gen")
-wrapper_dir  = os.path.join("src", "sas", "models", "c_extension", "python_wrapper", "generated")
+# wrapper_dir  = os.path.join("src", "sas", "models", "c_extension", "python_wrapper", "generated")
 model_dir = os.path.join("src", "sas","models")
 
@@ -291 +291 @@
 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)
-
-smear_sources = []
-append_file(file_list=smear_sources, dir_path=smear_dir)
+append_file(file_list=model_sources, dir_path=c_model_dir)
+# append_file(file_list=model_sources, dir_path=wrapper_dir)
+
+# smear_sources = []
+# append_file(file_list=smear_sources, dir_path=smear_dir)
         
 package_dir["sas.models"] = model_dir
@@ -303 +303 @@
 packages.extend(["sas.models","sas.models.sas_extension"])
     
-smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
-                  os.path.join(smear_dir, "smearer_module.cpp")]
+# smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
+#                   os.path.join(smear_dir, "smearer_module.cpp")]
 geni_sources = [os.path.join(gen_dir, "sld2i_module.cpp")]
 if os.name=='nt':
-    smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
+#     smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
     geni_sources.append(os.path.join(igordir, "winFuncs.c"))
 
 c_models = [ 
-    #Extension("sas.models.sas_extension.c_models",
+    # Extension("sas.models.sas_extension.c_models",
     #    sources=model_sources,
     #    include_dirs=[
     #        igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
     #    ],
-    #),
+    # ),
 
     # Smearer extension
-    Extension("sas.models.sas_extension.smearer",
-        sources = smearer_sources,
-        include_dirs=[igordir,  smear_dir, numpy_incl_path],
-    ),
-                    
-    Extension("sas.models.sas_extension.smearer2d_helper",
-        sources = [
-            os.path.join(smear_dir, "smearer2d_helper_module.cpp"),
-            os.path.join(smear_dir, "smearer2d_helper.cpp"),
-            os.path.join(igordir, "winFuncs.c"),
-        ],
-        include_dirs=[smear_dir, numpy_incl_path],
-    ),
-                    
+    # Extension("sas.models.sas_extension.smearer",
+    #     sources = smearer_sources,
+    #     include_dirs=[igordir,  smear_dir, numpy_incl_path],
+    # ),
+    #
+    # Extension("sas.models.sas_extension.smearer2d_helper",
+    #     sources = [
+    #         os.path.join(smear_dir, "smearer2d_helper_module.cpp"),
+    #         os.path.join(smear_dir, "smearer2d_helper.cpp"),
+    #         os.path.join(igordir, "winFuncs.c"),
+    #     ],
+    #     include_dirs=[smear_dir, numpy_incl_path],
+    # ),
+    #
     Extension("sas.models.sas_extension.sld2i",
         sources = [