Changeset 156203a in sasview for installers


Ignore:
Timestamp:
Aug 30, 2017 5:42:31 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:
0046c6a
Parents:
edf7dc6
Message:

default_categories.json was removed from installer

Location:
installers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • installers/setup_exe.py

    r25a42f99 r156203a  
    228228    'custom_config.py', 
    229229    'local_config.py', 
    230     #'default_categories.json', 
    231230    ] 
    232231DATA_FILES.append(('.', [os.path.join(sasview_path, v) for v in config_files])) 
    233232DATA_FILES.append(('config', [os.path.join(sasview_path, 'custom_config.py')])) 
    234  
    235 # default_categories.json is beside the config files 
    236 category_config = os.path.join(os.path.dirname(local_config_file), 
    237                                'default_categories.json') 
    238 if os.path.isfile(category_config): 
    239     DATA_FILES.append(('.', [category_config])) 
    240233 
    241234if os.path.isfile("BUILD_NUMBER"): 
  • installers/setup_mac.py

    rb708b2a r156203a  
    7373DATA_FILES.append(('.', [local_config_file])) 
    7474DATA_FILES.append(('.', [logging_ini])) 
    75  
    76 # default_categories.json is beside the config files 
    77 category_config = os.path.join(sasview_path, 'default_categories.json') 
    78 if os.path.isfile(category_config): 
    79     DATA_FILES.append(('.', [category_config])) 
    8075 
    8176if os.path.isfile("BUILD_NUMBER"): 
Note: See TracChangeset for help on using the changeset viewer.