Changeset 08dcf6c8 in sasview

Timestamp:

Dec 5, 2011 5:30:40 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

495acc2

Parents:

2a48bb0

Message:

Re #5 fixing mac tests

Files:

• deps.py (modified) (1 diff)
• test/utest_sansview.py (modified) (2 diffs)

deps.py

@@ -47 +47 @@
     print "No PIL"
     
+# The following is necessary to build an app
+try:
+    import py2app
+    print "py2app ", py2app.__version__
+except:
+    print "No py2app: recommending version >= 0.6.4"
+    
+try:
+    import altgraph
+    print "altgraph ", altgraph.__version__
+except:
+    print "No altgraph"    
+    
+try:
+    import modulegraph
+    print "modulegraph ", modulegraph.__version__
+except:
+    print "No modulegraph: recommending version >= 0.9.1"
+    
+try:
+    import macholib
+    print "macholib ", macholib.__version__
+except:
+    print "No macholib: recommending version >= 1.4.3"
+    
+  
+    

test/utest_sansview.py

@@ -2 +2 @@
 import subprocess
 import re
+import sys
 
 SKIPPED_DIRS = ["sansrealspace", "calculatorview"]
@@ -29 +30 @@
                 if os.path.isfile(file_path) and f.startswith("utest_") and f.endswith(".py"):
                     module_name,_ = os.path.splitext(f)
-                    code = "cd %s%spython -c \"import sys;import xmlrunner;import unittest;sys.path.insert(0, '%s');" % (module_dir, COMMAND_SEP, module_dir)
+                    code = "cd %s%s%s -c \"import sys;import xmlrunner;import unittest;sys.path.insert(0, '%s');" % (module_dir, COMMAND_SEP, sys.executable, module_dir)
                     code += "from %s import *;" % module_name
                     code += "unittest.main(testRunner=xmlrunner.XMLTestRunner(output='logs'))\""