diff --git a/conda/meta.yaml b/conda/meta.yaml index cd42e1d060c3f6854592be089cffb5624c17a1f3..7834daced126c8c03a24c5d538dc264e7afca25d 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -23,7 +23,7 @@ requirements: - setuptools {{ setuptools }} - pip {{ pip }} - bob.io.base - - exposed + - clapp - numpy {{ numpy }} - scipy {{ scipy }} - h5py {{ h5py }} @@ -34,7 +34,7 @@ requirements: - python - setuptools - bob.io.base - - exposed + - clapp - {{ pin_compatible('numpy') }} - {{ pin_compatible('scipy') }} - {{ pin_compatible('h5py') }} diff --git a/pyproject.toml b/pyproject.toml index a55fcbb70d54190226de3f9a09a8699b5226c922..46af727c0d25d3b3add9bdf48c321c41112b449b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ "setuptools", "numpy", "bob.io.base", - "exposed", + "clapp", "scipy", "h5py", "matplotlib", diff --git a/src/bob/measure/script/common_options.py b/src/bob/measure/script/common_options.py index b2d5cbff432832cd70b95e11b2c6fe0579e25dc5..a3405fa4280e2396b98003253832990d340798c7 100644 --- a/src/bob/measure/script/common_options.py +++ b/src/bob/measure/script/common_options.py @@ -7,8 +7,8 @@ import click import matplotlib.pyplot as plt import tabulate +from clapp.click import verbosity_option from click.types import FLOAT, INT -from exposed.click import verbosity_option from matplotlib.backends.backend_pdf import PdfPages LOGGER = logging.getLogger(__name__) diff --git a/src/bob/measure/script/gen.py b/src/bob/measure/script/gen.py index 719f5045883776ce9707430e3d21f615c2cfb19a..fd62da49130ce90881c4cc882b5e781e8cf9bcf0 100644 --- a/src/bob/measure/script/gen.py +++ b/src/bob/measure/script/gen.py @@ -12,8 +12,8 @@ import click import numpy import numpy.random +from clapp.click import verbosity_option from click.types import FLOAT -from exposed.click import verbosity_option logger = logging.getLogger(__name__) @@ -96,8 +96,8 @@ def write_scores_to_file(neg, pos, filename): @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) -@verbosity_option(logger) -def gen(outdir, mean_neg, mean_pos, **kwargs): +@verbosity_option(logger, expose_value=False) +def gen(outdir, mean_neg, mean_pos): """Generate random scores. Generates random scores for negative and positive scores, whatever they diff --git a/src/bob/measure/script/measure.py b/src/bob/measure/script/measure.py index 02eadf3762805ca6d9845ca2813ea9da25eee694..56f98e59a2559e1713a31ae51ddc71d91fcb68f5 100644 --- a/src/bob/measure/script/measure.py +++ b/src/bob/measure/script/measure.py @@ -3,8 +3,8 @@ import click import pkg_resources +from clapp.click import AliasedGroup from click_plugins import with_plugins -from exposed.click import AliasedGroup @with_plugins(pkg_resources.iter_entry_points("bob.measure.cli"))