Commit bd6db3f2 authored by Olivier Sallou's avatar Olivier Sallou
Browse files

New upstream version 3.0.20

parent 2febd9ea

CHANGES.txt

+3 −0
Original line number Diff line number Diff line 
3.0.20:

  Add some checks on options

  Add data-list and data-import options

3.0.19:

  Fix traefix prefix

3.0.18:

biomaj_daemon/daemon/biomaj_daemon_web.py

+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,9 @@ OPTIONS_PARAMS = { 
    'proxy': None,

    'schedule': False,

    'history': False,

    'historyLimit': 20

    'historyLimit': 20,

    'datalist': False,

    'dataimport': False

}

biomaj_daemon/daemon/utils.py

+27 −0
Original line number Diff line number Diff line
@@ -712,6 +712,8 @@ def biomaj_update_status(options, config): 
    '''

    get the status of a bank during an update cycle

    '''

    if not options.bank:

        return (False, 'bank option is missing')

    if not options.proxy:

        return (False, 'option not allowed without --proxy option')

    redis_client = redis.StrictRedis(
@@ -827,6 +829,27 @@ def biomaj_stats(options, config): 
    return (True, msg)





def biomaj_data_list(options, config):

    try:

        from biomaj_data.utils import list as blist

        return (True, 'Bank templates: ' + str(blist()))

    except Exception:

        return (False, 'biomaj-data package not installed')





def biomaj_data_import(options, config):

    if not options.bank:

        return (False, 'option bank is missing')

    try:

        from biomaj_data.utils import importTo

        (err, file_path) = importTo(options.bank, BiomajConfig.global_config.get('GENERAL', 'conf.dir'))

        if err:

            return (False, file_path)

        return (True, 'Bank imported: ' + str(file_path))

    except Exception:

        return (False, 'biomaj-data package not installed')





def biomaj_history(options, config):

    history = Bank.get_history(options.historyLimit)

    results = []
@@ -925,5 +948,9 @@ def biomaj_client_action(options, config=None): 


    if options.aboutme:

        return biomaj_user_info(options, config)

    if options.datalist:

        return biomaj_data_list(options, config)

    if options.dataimport:

        return biomaj_data_import(options, config)



    return (False, "no option match")

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config = { 
    'url': 'http://biomaj.genouest.org',

    'download_url': 'http://biomaj.genouest.org',

    'author_email': 'olivier.sallou@irisa.fr',

    'version': '3.0.19',

    'version': '3.0.20',

     'classifiers': [

        # How mature is this project? Common values are

        #   3 - Alpha