Changes in setup.py [a7c4ad2:5881b17] in sasview

File:

• setup.py (modified) (6 diffs)

setup.py

@@ -38 +38 @@
 # except when there is no such file
 # Todo : make this list generic
-# plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py',
+#plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py',
 #                      'sum_Ap1_1_Ap2.py', 'sum_p1_p2.py',
 #                      'testmodel_2.py', 'testmodel.py',
@@ -59 +59 @@
     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):
+    #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:
@@ -249 +249 @@
 
 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/*']
+packages.extend(["sas.sasgui.perspectives.fitting"])
+package_data['sas.sasgui.perspectives.fitting'] = ['media/*']
 
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])
@@ -297 +296 @@
 append_file(file_sources, gen_dir)
 
+#Wojtek's hacky way to add doc files while bundling egg
+#def add_doc_files(directory):
+#    paths = []
+#    for (path, directories, filenames) in os.walk(directory):
+#        for filename in filenames:
+#            paths.append(os.path.join(path, filename))
+#    return paths
+
+#doc_files = add_doc_files('doc')
+
 # SasView
 package_dir["sas.sasview"] = "sasview"
-package_data['sas.sasview'] = ['images/*', 
+package_data['sas.sasview'] = ['images/*',
                                'media/*',
                                'test/*.txt',
@@ -310 +319 @@
 
 required = [
-    'bumps>=0.7.5.9', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
+    'bumps>=0.7.5.6', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
 
     # 'lxml>=2.2.2',
@@ -325 +334 @@
 else:
     required.extend(['pil'])
-   
+
 # Set up SasView    
 setup(