From ff5f2af32771f3f882b529ae1c35f1cc208c404a Mon Sep 17 00:00:00 2001
From: Andre Mayoraz <andre.mayoraz@idiap.ch>
Date: Tue, 14 Feb 2023 09:36:37 +0100
Subject: [PATCH] bob.extension removal
---
conda/meta.yaml | 4 ++--
pyproject.toml | 2 +-
src/bob/fusion/base/__init__.py | 8 --------
src/bob/fusion/base/script/boundary.py | 3 ++-
src/bob/fusion/base/script/fuse.py | 3 ++-
src/bob/fusion/base/script/fusion.py | 3 +--
src/bob/fusion/base/script/resource.py | 4 ++--
tests/test_scripts.py | 3 +--
8 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 8fe8229..b6efea7 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 43ed7af..f852bb9 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 0a5e912..63f8744 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 55caad6..40a5141 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 5ac6998..73c07b1 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 f30807b..456f805 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 7ed23e9..4413698 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 f4a8694..c8189d4 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/"),
--
GitLab