Changeset ed03b99 in sasview


Ignore:
Timestamp:
May 2, 2017 6:05:52 PM (7 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:
7c105e8
Parents:
2f6d340
Message:

move logger config into root of sas so it is available immediately

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • installers/setup_exe.py

    r2f6d340 red03b99  
    222222 
    223223# Copy the config files 
    224 sasview_path = os.path.join('..','src','sas','sasview') 
     224sas_path = os.path.join('..', 'src', 'sas') 
     225DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')])) 
     226sasview_path = os.path.join(sas_path,'sasview') 
    225227config_files = [ 
    226228    'custom_config.py', 
    227229    'local_config.py', 
    228     'logging.init', 
    229230    #'default_categories.json', 
    230231    ] 
  • installers/setup_mac.py

    r2f6d340 red03b99  
    6262 
    6363# Copy the config files 
    64 sasview_path = os.path.join('..','src','sas','sasview') 
     64sas_path = os.path.join('..', 'src', 'sas') 
     65DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')])) 
     66sasview_path = os.path.join(sas_path,'sasview') 
    6567custom_config_file = os.path.join(sasview_path, 'custom_config.py') 
    6668local_config_file = os.path.join(sasview_path, 'local_config.py') 
  • run.py

    r914ba0a red03b99  
    146146    # so logging can be done during initialization process too 
    147147    root = abspath(dirname(__file__)) 
    148     addpath(joinpath(root, 'sasview')) 
    149     from logger_config import SetupLogger 
     148    addpath(joinpath(root, 'src')) 
     149    from sas.logger_config import SetupLogger 
    150150    logger = SetupLogger(__name__).config_development() 
    151151 
  • setup.py

    rd66dbcc red03b99  
    370370 
    371371# SasView 
     372package_data['sas'] = ['logging.ini'] 
    372373package_data['sas.sasview'] = ['images/*', 
    373374                               'media/*', 
    374                                'logging.ini', 
    375375                               'test/*.txt', 
    376376                               'test/1d_data/*', 
Note: See TracChangeset for help on using the changeset viewer.