From 6d0185f7fba4d8a4f76a9c35d2e78542ee0c226a Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Wed, 4 Oct 2023 12:33:33 +0200 Subject: [PATCH] Revert "Load the cli module lazily for spacy.info (#12962)" This reverts commit beda27a91eadd70563dbaffd844d8c9d5e245928. --- spacy/__init__.py | 7 +------ spacy/tests/test_cli.py | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/spacy/__init__.py b/spacy/__init__.py index 8aa2eccd7..1a18ad0d5 100644 --- a/spacy/__init__.py +++ b/spacy/__init__.py @@ -13,6 +13,7 @@ from thinc.api import Config, prefer_gpu, require_cpu, require_gpu # noqa: F401 from . import pipeline # noqa: F401 from . import util from .about import __version__ # noqa: F401 +from .cli.info import info # noqa: F401 from .errors import Errors from .glossary import explain # noqa: F401 from .language import Language @@ -76,9 +77,3 @@ def blank( # We should accept both dot notation and nested dict here for consistency config = util.dot_to_dict(config) return LangClass.from_config(config, vocab=vocab, meta=meta) - - -def info(*args, **kwargs): - from .cli.info import info as cli_info - - return cli_info(*args, **kwargs) diff --git a/spacy/tests/test_cli.py b/spacy/tests/test_cli.py index 0d2fe0a9e..86451317b 100644 --- a/spacy/tests/test_cli.py +++ b/spacy/tests/test_cli.py @@ -12,7 +12,6 @@ from thinc.api import Config import spacy from spacy import about -from spacy import info as spacy_info from spacy.cli import info from spacy.cli._util import parse_config_overrides, string_to_list, walk_directory from spacy.cli.apply import apply @@ -193,9 +192,6 @@ def test_cli_info(): raw_data = info(tmp_dir, exclude=[""]) assert raw_data["lang"] == "nl" assert raw_data["components"] == ["textcat"] - raw_data = spacy_info(tmp_dir, exclude=[""]) - assert raw_data["lang"] == "nl" - assert raw_data["components"] == ["textcat"] def test_cli_converters_conllu_to_docs():