Changeset c4a7660 in sasview


Ignore:
Timestamp:
Mar 31, 2015 4:49:11 PM (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • sasview/sasview.py

    rf76bf17 r4e080980  
    1212import sys 
    1313import logging 
    14 from shutil import copy 
     14import traceback 
     15 
    1516logging.basicConfig(level=logging.INFO, 
    1617                    format='%(asctime)s %(levelname)s %(message)s', 
     
    109110            self.gui.add_perspective(fitting_plug) 
    110111        except Exception as inst: 
    111             logging.error("Fitting problems: " + str(inst)) 
    112             logging.error("%s: could not find Fitting plug-in module"% APP_NAME)  
    113             logging.error(sys.exc_value) 
     112            logging.error("%s: could not find Fitting plug-in module"% APP_NAME) 
     113            logging.error(traceback.format_exc()) 
    114114 
    115115        # P(r) perspective 
     
    120120        except: 
    121121            logging.error("%s: could not find P(r) plug-in module"% APP_NAME) 
    122             logging.error(sys.exc_value)   
    123          
     122            logging.error(traceback.format_exc()) 
     123 
    124124        #Invariant perspective 
    125125        try: 
     
    131131            logging.error("%s: could not find Invariant plug-in module"% \ 
    132132                          APP_NAME) 
    133             logging.error(sys.exc_value)   
    134          
     133            logging.error(traceback.format_exc()) 
     134 
    135135        #Calculator perspective    
    136136        try: 
     
    141141            logging.error("%s: could not find Calculator plug-in module"% \ 
    142142                                                        APP_NAME) 
    143             logging.error(sys.exc_value)   
    144          
     143            logging.error(traceback.format_exc()) 
     144 
    145145             
    146146        # Add welcome page 
  • src/sas/guiframe/gui_statusbar.py

    r1805b87 r4342107f  
    2222CONSOLE_WIDTH = 500 
    2323CONSOLE_HEIGHT = 300 
    24 FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH,wx.BITMAP_TYPE_ICON) 
     24FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH, wx.BITMAP_TYPE_ICO) 
    2525 
    2626if sys.platform.count("win32") > 0: 
  • sasview/setup_exe.py

    r2eeca83 rc971c98  
    1414# See for example the 'images' directory below. 
    1515 
    16 import os, sys 
    17 import platform 
     16import os 
     17import sys 
    1818 
    1919# put the build directory at the front of the path 
     
    2222from distutils.util import get_platform 
    2323root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
    24 platform = '%s-%s'%(get_platform(),sys.version[:3]) 
    25 build_path = os.path.join(root, 'build','lib.'+platform) 
     24platform = '%s-%s'%(get_platform(), sys.version[:3]) 
     25build_path = os.path.join(root, 'build', 'lib.'+platform) 
    2626sys.path.insert(0, build_path) 
    2727 
     
    6262    except ImportError: 
    6363        import modulefinder 
    64     import win32com, sys 
     64    import win32com 
    6565    for p in win32com.__path__[1:]: 
    6666        modulefinder.AddPackagePath(win32_folder, p) 
     
    211211    manifest = manifest_for_python25 
    212212    py26MSdll = None 
    213      
     213 
     214 
    214215class Target: 
    215216    def __init__(self, **kw): 
     
    260261# Copy the settings file for the sas.dataloader file extension associations 
    261262import sas.dataloader.readers 
    262 f = os.path.join(sas.dataloader.readers.get_data_path(),'defaults.json') 
     263f = os.path.join(sas.dataloader.readers.get_data_path(), 'defaults.json') 
    263264if os.path.isfile(f): 
    264265    data_files.append(('.', [f])) 
     
    276277     
    277278if os.path.isfile("BUILD_NUMBER"): 
    278     data_files.append(('.',["BUILD_NUMBER"])) 
     279    data_files.append(('.', ["BUILD_NUMBER"])) 
    279280 
    280281# Copying the images directory to the distribution directory. 
     
    303304    raise Exception("You must first build the documentation before creating an installer.") 
    304305 
    305 if py26MSdll != None: 
     306if py26MSdll is not None: 
    306307    # install the MSVC 9 runtime dll's into the application folder 
    307308    data_files.append(("Microsoft.VC90.CRT", py26MSdll)) 
    308 if py26MSdll_x86 != None: 
     309if py26MSdll_x86 is not None: 
    309310    # install the MSVC 9 runtime dll's into the application folder 
    310311    data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86)) 
     
    332333    'reportlab.platypus', 
    333334    ]) 
     335packages.append('periodictable.core') # not found automatically 
    334336#packages.append('IPython') 
    335 includes = ['site','lxml._elementpath', 'lxml.etree'] 
     337includes = ['site', 'lxml._elementpath', 'lxml.etree'] 
    336338 
    337339# Exclude packages that are not needed but are often found on build systems 
     
    357359    script = 'sasview.py', 
    358360    icon_resources = [(1, os.path.join(images_dir, "ball.ico"))], 
    359     other_resources = [(24,1,manifest)], 
     361    other_resources = [(24, 1, manifest)], 
    360362    dest_base = "SasView" 
    361363    ) 
     
    376378        'py2exe': { 
    377379            'dll_excludes': dll_excludes, 
    378             'packages' : packages, 
    379             'includes':includes, 
    380             'excludes':excludes, 
     380            'packages': packages, 
     381            'includes': includes, 
     382            'excludes': excludes, 
    381383            "compressed": 1, 
    382384            "optimize": 0, 
    383             "bundle_files":bundle_option, 
     385            "bundle_files": bundle_option, 
    384386            }, 
    385387    }, 
    386388    data_files=data_files, 
    387      
    388389) 
    389  
    390  
Note: See TracChangeset for help on using the changeset viewer.