Changeset 25a42f99 in sasview for installers


Ignore:
Timestamp:
Aug 29, 2017 5:34:30 PM (2 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
e912a58
Parents:
759a8ab
Message:

lint

Location:
installers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • installers/setup_exe.py

    r759a8ab r25a42f99  
    6262        del sys.argv[path_flag_idx+1] 
    6363        sys.argv.remove('--extrapath') 
    64 except: 
     64except Exception: 
    6565    print("Error processing extra python path needed to build SasView\n  %s" % 
    6666          sys.exc_value) 
     
    224224sas_path = os.path.join('..', 'src', 'sas') 
    225225DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')])) 
    226 sasview_path = os.path.join(sas_path,'sasview') 
     226sasview_path = os.path.join(sas_path, 'sasview') 
    227227config_files = [ 
    228228    'custom_config.py', 
     
    260260# Copying the sample data user data 
    261261for f in findall(test_1d_dir): 
    262     DATA_FILES.append((os.path.join("test","1d_data"), [f])) 
     262    DATA_FILES.append((os.path.join("test", "1d_data"), [f])) 
    263263 
    264264# Copying the sample data user data 
    265265for f in findall(test_2d_dir): 
    266     DATA_FILES.append((os.path.join("test","2d_data"), [f])) 
     266    DATA_FILES.append((os.path.join("test", "2d_data"), [f])) 
    267267 
    268268# Copying the sample data user data 
    269269for f in findall(test_save_dir): 
    270     DATA_FILES.append((os.path.join("test","save_states"), [f])) 
     270    DATA_FILES.append((os.path.join("test", "save_states"), [f])) 
    271271 
    272272# Copying the sample data user data 
    273273for f in findall(test_upcoming_dir): 
    274     DATA_FILES.append((os.path.join("test","upcoming_formats"), [f])) 
     274    DATA_FILES.append((os.path.join("test", "upcoming_formats"), [f])) 
    275275 
    276276# Copying opencl include files 
     
    278278opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl") 
    279279for f in findall(opencl_include_dir): 
    280     DATA_FILES.append((os.path.join("includes","pyopencl"), [f])) 
     280    DATA_FILES.append((os.path.join("includes", "pyopencl"), [f])) 
    281281 
    282282# Numerical libraries 
     
    319319packages = [ 
    320320    'matplotlib', 'scipy', 'encodings', 'comtypes', 'h5py', 
    321     'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas', 
     321    'win32com', 'xhtml2pdf', 'bumps', 'sasmodels', 'sas', 
    322322    ] 
    323323packages.extend([ 
     
    336336 
    337337# For an interactive interpreter, SasViewCom 
    338 packages.extend(['IPython','pyreadline','pyreadline.unicode_helper']) 
     338packages.extend(['IPython', 'pyreadline', 'pyreadline.unicode_helper']) 
    339339 
    340340# individual models 
     
    365365 
    366366target_wx_client = Target( 
    367     description = 'SasView', 
    368     script = 'sasview_gui.py', 
    369     icon_resources = [(1, local_config.SetupIconFile_win)], 
    370     other_resources = [(24, 1, manifest)], 
    371     dest_base = "SasView" 
     367    description='SasView', 
     368    script='sasview_gui.py', 
     369    icon_resources=[(1, local_config.SetupIconFile_win)], 
     370    other_resources=[(24, 1, manifest)], 
     371    dest_base="SasView" 
    372372) 
    373373 
    374374target_console_client = Target( 
    375     description = 'SasView console', 
    376     script = 'sasview_console.py', 
    377     icon_resources = [(1, local_config.SetupIconFile_win)], 
    378     other_resources = [(24, 1, manifest)], 
    379     dest_base = "SasViewCom" 
     375    description='SasView console', 
     376    script='sasview_console.py', 
     377    icon_resources=[(1, local_config.SetupIconFile_win)], 
     378    other_resources=[(24, 1, manifest)], 
     379    dest_base="SasViewCom" 
    380380) 
    381381 
  • installers/setup_mac.py

    ra67ec83 r25a42f99  
    77 
    88NOTES: 
    9    12/01/2011: When seeing an error related to pytz.zoneinfo not being found, change the following line in py2app/recipes/matplotlib.py 
     9   12/01/2011: When seeing an error related to pytz.zoneinfo not being found, 
     10               change the following line in py2app/recipes/matplotlib.py 
    1011               mf.import_hook('pytz.tzinfo', m, ['UTC']) 
    1112   12/05/2011: Needs macholib >= 1.4.3 and py2app >= 0.6.4 to create a 64-bit app 
     
    5960#CANSAxml reader data files 
    6061from sas.sascalc.dataloader import readers 
    61 RESOURCES_FILES.append(os.path.join(readers.get_data_path(),'defaults.json')) 
     62RESOURCES_FILES.append(os.path.join(readers.get_data_path(), 'defaults.json')) 
    6263 
    6364# Copy the config files 
    6465sas_path = os.path.join('..', 'src', 'sas') 
    6566DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')])) 
    66 sasview_path = os.path.join(sas_path,'sasview') 
     67sasview_path = os.path.join(sas_path, 'sasview') 
    6768custom_config_file = os.path.join(sasview_path, 'custom_config.py') 
    6869local_config_file = os.path.join(sasview_path, 'local_config.py') 
     
    99100# Copying the sample data user data 
    100101for f in findall(test_1d_dir): 
    101     DATA_FILES.append((os.path.join("test","1d_data"), [f])) 
     102    DATA_FILES.append((os.path.join("test", "1d_data"), [f])) 
    102103 
    103104# Copying the sample data user data 
    104105for f in findall(test_2d_dir): 
    105     DATA_FILES.append((os.path.join("test","2d_data"), [f])) 
     106    DATA_FILES.append((os.path.join("test", "2d_data"), [f])) 
    106107 
    107108# Copying the sample data user data 
    108109for f in findall(test_save_dir): 
    109     DATA_FILES.append((os.path.join("test","save_states"), [f])) 
     110    DATA_FILES.append((os.path.join("test", "save_states"), [f])) 
    110111 
    111112# Copying the sample data user data 
    112113for f in findall(test_upcoming_dir): 
    113     DATA_FILES.append((os.path.join("test","upcoming_formats"), [f])) 
     114    DATA_FILES.append((os.path.join("test", "upcoming_formats"), [f])) 
    114115 
    115116# Copying opencl include files 
     
    117118opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl") 
    118119for f in findall(opencl_include_dir): 
    119     DATA_FILES.append((os.path.join("includes","pyopencl"), [f])) 
     120    DATA_FILES.append((os.path.join("includes", "pyopencl"), [f])) 
    120121 
    121122# See if the documentation has been built, and if so include it. 
     
    167168plist = dict(CFBundleDocumentTypes=[dict(CFBundleTypeExtensions=EXTENSIONS_LIST, 
    168169                                         CFBundleTypeIconFile=ICON, 
    169                                    CFBundleTypeName="sasview file", 
    170                                    CFBundleTypeRole="Shell" )],) 
     170                                         CFBundleTypeName="sasview file", 
     171                                         CFBundleTypeRole="Shell")],) 
    171172 
    172173# Locate libxml2 library 
Note: See TracChangeset for help on using the changeset viewer.