From 076ca4a05b6e40ac162a8635734c5cfb4feb031d Mon Sep 17 00:00:00 2001 From: Yannick DAYER <yannick.dayer@idiap.ch> Date: Tue, 14 Feb 2023 09:39:57 +0100 Subject: [PATCH] [deps] Use clapp instead of exposed. --- conda/meta.yaml | 2 ++ pyproject.toml | 1 + src/bob/pad/base/script/cross.py | 2 +- src/bob/pad/base/script/finalize_scores.py | 2 +- src/bob/pad/base/script/pad.py | 2 +- src/bob/pad/base/script/pad_commands.py | 2 +- src/bob/pad/base/script/run_pipeline.py | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 1201d1c..4f90343 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 971265f..09dadbc 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 a3ab03e..7aa903e 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 7d81e0b..0a3c385 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 518ebb2..20d1860 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 b822713..354a768 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 f8f7e77..58eec83 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, -- GitLab