Changes in / [aff7904:259aaa0] in sasview

Files:

• build_tools/jenkins_osx_build.sh (modified) (3 diffs)
• sasview/setup_mac.py (modified) (3 diffs)
• setup.py (modified) (4 diffs)

build_tools/jenkins_osx_build.sh

@@ -1 +1 @@
 export PATH=$PATH:/usr/local/bin/
+
 
 PYTHON=${PYTHON:-`which python`}
@@ -66 +67 @@
 
 # TEST
-#cd $WORKSPACE
-#cd sasview
-#cd test
-#$PYTHON utest_sasview.py
+cd $WORKSPACE
+cd sasview
+cd test
+$PYTHON utest_sasview.py
+
 
 # PYLINT
@@ -76 +78 @@
 $PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt
 
+
 # BUILD APP
 cd $WORKSPACE
 cd sasview/sasview
-$PYTHON setup_mac.py py2app
+python setup_mac.py py2app
 

sasview/setup_mac.py

@@ -20 +20 @@
 import sys
 import platform
-#Extending recursion limit
-sys.setrecursionlimit(10000)
 
 from distutils.util import get_platform
@@ -28 +26 @@
 build_path = os.path.join(root, 'build','lib.'+platform)
 sys.path.insert(0, build_path)
-print "BUILDING PATH INSIDE", build_path
+
 ICON = local_config.SetupIconFile_mac
 EXTENSIONS_LIST = []
@@ -69 +67 @@
 # See if the documentation has been built, and if so include it.
 doc_path = os.path.join(build_path, "doc")
-print doc_path
 if os.path.exists(doc_path):
     for dirpath, dirnames, filenames in os.walk(doc_path):

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:
@@ -297 +297 @@
 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',
@@ -335 +325 @@
 else:
     required.extend(['pil'])
-
+   
 # Set up SasView    
 setup(