diff --git a/conda/meta.yaml b/conda/meta.yaml index 8fe822929cbf6c661943bf978c255f3446402d62..b6efea74d7b719d274d997eb492d2373f5ded88b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,7 +21,7 @@ requirements: - python {{ python }} - setuptools {{ setuptools }} - pip {{ pip }} - - bob.extension + - clapp - bob.measure - bob.learn.em - bob.bio.base @@ -31,7 +31,7 @@ requirements: run: - python - setuptools - - bob.extension + - clapp - bob.measure - bob.learn.em - bob.bio.base diff --git a/pyproject.toml b/pyproject.toml index 43ed7aff2607147d8dcd1030f807378f343ea746..f852bb999c6656c486d127b9003dfe05081b3783 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ dependencies = [ "setuptools", "numpy", - "bob.extension", + "clapp", "bob.measure", "bob.learn.em", "bob.bio.base", diff --git a/src/bob/fusion/base/__init__.py b/src/bob/fusion/base/__init__.py index 0a5e9125e0383d12ac32260a7be39ebd799f2ce0..63f8744e1f789c0a5cbdb588448e57d5854e4386 100644 --- a/src/bob/fusion/base/__init__.py +++ b/src/bob/fusion/base/__init__.py @@ -1,12 +1,4 @@ from . import algorithm, config, preprocessor, script, tools # noqa: F401 - -def get_config(): - """Returns a string containing the configuration information.""" - import bob.extension - - return bob.extension.get_config(__name__) - - # gets sphinx autodoc done right - don't remove it __all__ = [_ for _ in dir() if not _.startswith("_")] diff --git a/src/bob/fusion/base/script/boundary.py b/src/bob/fusion/base/script/boundary.py index 55caad6a338c0c9c1b5cce2bd175569b9c72e36e..40a5141cbb3ff42c02bc1e7ceb5e938073c8c11a 100644 --- a/src/bob/fusion/base/script/boundary.py +++ b/src/bob/fusion/base/script/boundary.py @@ -5,8 +5,9 @@ import logging import click import numpy as np +from clapp.click import verbosity_option + from bob.bio.base.score import load_score -from bob.extension.scripts.click_helper import verbosity_option from ..algorithm import Algorithm from ..tools import ( diff --git a/src/bob/fusion/base/script/fuse.py b/src/bob/fusion/base/script/fuse.py index 5ac6998ce3c5deb2b0b09093d1449bd1d2304021..73c07b1d323348f69029c92500ce13780c1102d5 100644 --- a/src/bob/fusion/base/script/fuse.py +++ b/src/bob/fusion/base/script/fuse.py @@ -9,9 +9,10 @@ import sys import click import numpy as np +from clapp.click import ResourceOption, verbosity_option + from bob.bio.base import utils from bob.bio.base.score import dump_score, load_score -from bob.extension.scripts.click_helper import ResourceOption, verbosity_option from ..tools import ( check_consistency, diff --git a/src/bob/fusion/base/script/fusion.py b/src/bob/fusion/base/script/fusion.py index f30807b4eb109c2a53d4572bd2e8b3ea4a2e5345..456f8057a3d8def720d254614172d5e5ed3181b2 100644 --- a/src/bob/fusion/base/script/fusion.py +++ b/src/bob/fusion/base/script/fusion.py @@ -3,10 +3,9 @@ import click import pkg_resources +from clapp.click import AliasedGroup from click_plugins import with_plugins -from bob.extension.scripts.click_helper import AliasedGroup - @with_plugins(pkg_resources.iter_entry_points("bob.fusion.cli")) @click.group(cls=AliasedGroup) diff --git a/src/bob/fusion/base/script/resource.py b/src/bob/fusion/base/script/resource.py index 7ed23e9e78672113f287187a3ac45e5aaa0e7ac0..4413698edb79b6dca8bf44db2c9ab614189e0f7e 100644 --- a/src/bob/fusion/base/script/resource.py +++ b/src/bob/fusion/base/script/resource.py @@ -6,9 +6,9 @@ import logging import click -import bob.bio.base +from clapp.click import verbosity_option -from bob.extension.scripts.click_helper import verbosity_option +import bob.bio.base logger = logging.getLogger(__name__) diff --git a/tests/test_scripts.py b/tests/test_scripts.py index f4a86943b95e62f3f8f08ef95a9fd51b7701403f..c8189d4b1ffc06956b66fe42a352c3059d46fb6a 100644 --- a/tests/test_scripts.py +++ b/tests/test_scripts.py @@ -7,10 +7,9 @@ import numpy from click.testing import CliRunner from bob.bio.base.score import load_score -from bob.extension.scripts.click_helper import assert_click_runner_result from bob.fusion.base.script.boundary import boundary from bob.fusion.base.script.fuse import fuse -from bob.io.base.testing_utils import datafile +from bob.io.base.testing_utils import assert_click_runner_result, datafile train_files = [ datafile("scores-train-1", __name__, "data/"),