diff --git a/conda/meta.yaml b/conda/meta.yaml index 1201d1cfff885a7a554cb8ac11eca142401d266d..4f9034370f5d9846ae1f9a32fe15c85a47efa499 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,6 +21,7 @@ requirements: - python {{ python }} - setuptools {{ setuptools }} - pip {{ pip }} + - clapp - bob.extension - bob.io.base - bob.pipelines @@ -38,6 +39,7 @@ requirements: run: - python - setuptools + - clapp - bob.extension - bob.io.base - bob.pipelines diff --git a/pyproject.toml b/pyproject.toml index 971265f780d7c96db274b1385161c59880aba729..09dadbc5229669e09de53d70c3b2fae797af86a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,6 +26,7 @@ ] dependencies = [ "setuptools", + "clapp", "bob.extension", "bob.io.base", "bob.pipelines", diff --git a/src/bob/pad/base/script/cross.py b/src/bob/pad/base/script/cross.py index a3ab03e2c50b5a0271b2a4a33262d129bf6d216d..7aa903eb606e97088940c6d3b042b3de8fb7b8a7 100644 --- a/src/bob/pad/base/script/cross.py +++ b/src/bob/pad/base/script/cross.py @@ -10,7 +10,7 @@ import click import jinja2 import yaml -from exposed.click import log_parameters, verbosity_option +from clapp.click import log_parameters, verbosity_option from tabulate import tabulate from bob.bio.base.score.load import get_negatives_positives, load_score diff --git a/src/bob/pad/base/script/finalize_scores.py b/src/bob/pad/base/script/finalize_scores.py index 7d81e0b9a54ca12cbdf2a903b1af7a514d1fe0c6..0a3c3855888d7c52b290c4d0b8481fac63a239b3 100644 --- a/src/bob/pad/base/script/finalize_scores.py +++ b/src/bob/pad/base/script/finalize_scores.py @@ -4,7 +4,7 @@ import logging import click -from exposed.click import log_parameters, verbosity_option +from clapp.click import log_parameters, verbosity_option logger = logging.getLogger(__name__) diff --git a/src/bob/pad/base/script/pad.py b/src/bob/pad/base/script/pad.py index 518ebb2a50ea9e1bfa7b8f8c9ce93003f243eb44..20d18609e626bae1dba7b9e24fd3566a1b17240c 100644 --- a/src/bob/pad/base/script/pad.py +++ b/src/bob/pad/base/script/pad.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.pad.cli")) diff --git a/src/bob/pad/base/script/pad_commands.py b/src/bob/pad/base/script/pad_commands.py index b8227131279b3699e1ac867de4a2bf1d6b09ba6a..354a768afe1cdf79adb35bf8ad70d7114263856c 100644 --- a/src/bob/pad/base/script/pad_commands.py +++ b/src/bob/pad/base/script/pad_commands.py @@ -9,7 +9,7 @@ from functools import partial import click import numpy -from exposed.click import verbosity_option +from clapp.click import verbosity_option import bob.measure.script.figure as measure_figure diff --git a/src/bob/pad/base/script/run_pipeline.py b/src/bob/pad/base/script/run_pipeline.py index f8f7e77fe635fa6c049b22a23f09e97167f57857..58eec8325b4b58104a8583114ac4b91fc46f061c 100644 --- a/src/bob/pad/base/script/run_pipeline.py +++ b/src/bob/pad/base/script/run_pipeline.py @@ -5,7 +5,7 @@ import logging import click -from exposed.click import ( +from clapp.click import ( ConfigCommand, ResourceOption, log_parameters,