From 5636f1712ff7a8eebada378c2de9ef86ae9f304f Mon Sep 17 00:00:00 2001 From: Theophile GENTILHOMME Date: Fri, 29 Jun 2018 13:48:47 +0200 Subject: [PATCH] Everything is in bob.extension nowD --- bob/measure/script/common_options.py | 17 ++++++++--------- bob/measure/script/gen.py | 5 ++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bob/measure/script/common_options.py b/bob/measure/script/common_options.py index 3d49d10..38ce480 100644 --- a/bob/measure/script/common_options.py +++ b/bob/measure/script/common_options.py @@ -8,8 +8,7 @@ import matplotlib.pyplot as plt import tabulate from matplotlib.backends.backend_pdf import PdfPages from bob.extension.scripts.click_helper import ( - bool_option, list_float_option, verbosity_option, open_file_mode_option, - CONTEXT_SETTINGS + bool_option, list_float_option, verbosity_option, open_file_mode_option ) LOGGER = logging.getLogger(__name__) @@ -590,7 +589,7 @@ def metrics_command(docstring, criteria=('eer', 'min-hter', 'far')): def custom_metrics_command(func): func.__doc__ = docstring - @click.command(context_settings=CONTEXT_SETTINGS) + @click.command() @scores_argument(nargs=-1) @eval_option() @table_option() @@ -637,7 +636,7 @@ def roc_command(docstring): def custom_roc_command(func): func.__doc__ = docstring - @click.command(context_settings=CONTEXT_SETTINGS) + @click.command() @scores_argument(nargs=-1) @titles_option() @legends_option() @@ -692,7 +691,7 @@ def det_command(docstring): def custom_det_command(func): func.__doc__ = docstring - @click.command(context_settings=CONTEXT_SETTINGS) + @click.command() @scores_argument(nargs=-1) @output_plot_file_option(default_out='det.pdf') @titles_option() @@ -745,7 +744,7 @@ def epc_command(docstring): def custom_epc_command(func): func.__doc__ = docstring - @click.command(context_settings=CONTEXT_SETTINGS) + @click.command() @scores_argument(min_arg=1, force_eval=True, nargs=-1) @output_plot_file_option(default_out='epc.pdf') @titles_option() @@ -790,7 +789,7 @@ def hist_command(docstring): def custom_hist_command(func): func.__doc__ = docstring - @click.command(context_settings=CONTEXT_SETTINGS) + @click.command() @scores_argument(nargs=-1) @output_plot_file_option(default_out='hist.pdf') @eval_option() @@ -846,7 +845,7 @@ def evaluate_command(docstring, criteria=('eer', 'min-hter', 'far')): def custom_evaluate_command(func): func.__doc__ = docstring - @click.command(context_settings=CONTEXT_SETTINGS) + @click.command() @scores_argument(nargs=-1) @legends_option() @sep_dev_eval_option() @@ -960,7 +959,7 @@ def multi_metrics_command(docstring, criteria=('eer', 'min-hter', 'far')): def custom_metrics_command(func): func.__doc__ = docstring - @click.command('multi-metrics', context_settings=CONTEXT_SETTINGS) + @click.command('multi-metrics') @scores_argument(nargs=-1) @eval_option() @n_protocols_option() diff --git a/bob/measure/script/gen.py b/bob/measure/script/gen.py index 48b5509..f5289c3 100644 --- a/bob/measure/script/gen.py +++ b/bob/measure/script/gen.py @@ -5,8 +5,7 @@ import logging import numpy import click from click.types import FLOAT -from bob.extension.scripts.click_helper import (verbosity_option, - CONTEXT_SETTINGS) +from bob.extension.scripts.click_helper import verbosity_option from bob.core import random from bob.io.base import create_directories_safe @@ -74,7 +73,7 @@ def write_scores_to_file(neg, pos, filename): f.write(text) -@click.command(context_settings=CONTEXT_SETTINGS) +@click.command() @click.argument('outdir') @click.option('--mean-neg', default=-1, type=FLOAT, show_default=True) @click.option('--mean-pos', default=1, type=FLOAT, show_default=True) -- 2.21.0