Changeset c4a7660 in sasview

Timestamp:

Mar 31, 2015 4:49:11 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

415fb82

Parents:

c971c98 (diff), 4e080980 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:sasview/sasview

Files:

• sasview/sasview.py (modified) (5 diffs)
• src/sas/guiframe/gui_statusbar.py (modified) (1 diff)
• sasview/setup_exe.py (modified) (10 diffs)

sasview/sasview.py

@@ -12 +12 @@
 import sys
 import logging
-from shutil import copy
+import traceback
+
 logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(levelname)s %(message)s',
@@ -109 +110 @@
             self.gui.add_perspective(fitting_plug)
         except Exception as inst:
-            logging.error("Fitting problems: " + str(inst))
-            logging.error("%s: could not find Fitting plug-in module"% APP_NAME) 
-            logging.error(sys.exc_value)
+            logging.error("%s: could not find Fitting plug-in module"% APP_NAME)
+            logging.error(traceback.format_exc())
 
         # P(r) perspective
@@ -120 +120 @@
         except:
             logging.error("%s: could not find P(r) plug-in module"% APP_NAME)
-            logging.error(sys.exc_value)  
-        
+            logging.error(traceback.format_exc())
+
         #Invariant perspective
         try:
@@ -131 +131 @@
             logging.error("%s: could not find Invariant plug-in module"% \
                           APP_NAME)
-            logging.error(sys.exc_value)  
-        
+            logging.error(traceback.format_exc())
+
         #Calculator perspective   
         try:
@@ -141 +141 @@
             logging.error("%s: could not find Calculator plug-in module"% \
                                                         APP_NAME)
-            logging.error(sys.exc_value)  
-        
+            logging.error(traceback.format_exc())
+
             
         # Add welcome page

src/sas/guiframe/gui_statusbar.py

@@ -22 +22 @@
 CONSOLE_WIDTH = 500
 CONSOLE_HEIGHT = 300
-FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH,wx.BITMAP_TYPE_ICON)
+FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH, wx.BITMAP_TYPE_ICO)
 
 if sys.platform.count("win32") > 0:

sasview/setup_exe.py

@@ -14 +14 @@
 # See for example the 'images' directory below.
 
-import os, sys
-import platform
+import os
+import sys
 
 # put the build directory at the front of the path
@@ -22 +22 @@
 from distutils.util import get_platform
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-platform = '%s-%s'%(get_platform(),sys.version[:3])
-build_path = os.path.join(root, 'build','lib.'+platform)
+platform = '%s-%s'%(get_platform(), sys.version[:3])
+build_path = os.path.join(root, 'build', 'lib.'+platform)
 sys.path.insert(0, build_path)
 
@@ -62 +62 @@
     except ImportError:
         import modulefinder
-    import win32com, sys
+    import win32com
     for p in win32com.__path__[1:]:
         modulefinder.AddPackagePath(win32_folder, p)
@@ -211 +211 @@
     manifest = manifest_for_python25
     py26MSdll = None
-    
+
+
 class Target:
     def __init__(self, **kw):
@@ -260 +261 @@
 # Copy the settings file for the sas.dataloader file extension associations
 import sas.dataloader.readers
-f = os.path.join(sas.dataloader.readers.get_data_path(),'defaults.json')
+f = os.path.join(sas.dataloader.readers.get_data_path(), 'defaults.json')
 if os.path.isfile(f):
     data_files.append(('.', [f]))
@@ -276 +277 @@
     
 if os.path.isfile("BUILD_NUMBER"):
-    data_files.append(('.',["BUILD_NUMBER"]))
+    data_files.append(('.', ["BUILD_NUMBER"]))
 
 # Copying the images directory to the distribution directory.
@@ -303 +304 @@
     raise Exception("You must first build the documentation before creating an installer.")
 
-if py26MSdll != None:
+if py26MSdll is not None:
     # install the MSVC 9 runtime dll's into the application folder
     data_files.append(("Microsoft.VC90.CRT", py26MSdll))
-if py26MSdll_x86 != None:
+if py26MSdll_x86 is not None:
     # install the MSVC 9 runtime dll's into the application folder
     data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86))
@@ -332 +333 @@
     'reportlab.platypus',
     ])
+packages.append('periodictable.core') # not found automatically
 #packages.append('IPython')
-includes = ['site','lxml._elementpath', 'lxml.etree']
+includes = ['site', 'lxml._elementpath', 'lxml.etree']
 
 # Exclude packages that are not needed but are often found on build systems
@@ -357 +359 @@
     script = 'sasview.py',
     icon_resources = [(1, os.path.join(images_dir, "ball.ico"))],
-    other_resources = [(24,1,manifest)],
+    other_resources = [(24, 1, manifest)],
     dest_base = "SasView"
     )
@@ -376 +378 @@
         'py2exe': {
             'dll_excludes': dll_excludes,
-            'packages' : packages,
-            'includes':includes,
-            'excludes':excludes,
+            'packages': packages,
+            'includes': includes,
+            'excludes': excludes,
             "compressed": 1,
             "optimize": 0,
-            "bundle_files":bundle_option,
+            "bundle_files": bundle_option,
             },
     },
     data_files=data_files,
-    
 )
-
-