From 462a6ade21b266c59f86fc7542f916d2b35d1ada Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Tue, 10 Oct 2023 08:27:44 +0200 Subject: [PATCH 1/2] Restore spacy.cli.project API --- spacy/cli/__init__.py | 7 +++++++ spacy/cli/project/__init__.py | 0 spacy/cli/project/assets.py | 1 + spacy/cli/project/clone.py | 1 + spacy/cli/project/document.py | 1 + spacy/cli/project/dvc.py | 1 + spacy/cli/project/pull.py | 1 + spacy/cli/project/push.py | 1 + spacy/cli/project/remote_storage.py | 1 + spacy/cli/project/run.py | 1 + 10 files changed, 15 insertions(+) create mode 100644 spacy/cli/project/__init__.py create mode 100644 spacy/cli/project/assets.py create mode 100644 spacy/cli/project/clone.py create mode 100644 spacy/cli/project/document.py create mode 100644 spacy/cli/project/dvc.py create mode 100644 spacy/cli/project/pull.py create mode 100644 spacy/cli/project/push.py create mode 100644 spacy/cli/project/remote_storage.py create mode 100644 spacy/cli/project/run.py diff --git a/spacy/cli/__init__.py b/spacy/cli/__init__.py index f3c6dbfed5f..60fe718c7e6 100644 --- a/spacy/cli/__init__.py +++ b/spacy/cli/__init__.py @@ -22,6 +22,13 @@ from .package import package # noqa: F401 from .pretrain import pretrain # noqa: F401 from .profile import profile # noqa: F401 +from .project.assets import project_assets # noqa: F401 +from .project.clone import project_clone # noqa: F401 +from .project.document import project_document # noqa: F401 +from .project.dvc import project_update_dvc # noqa: F401 +from .project.pull import project_pull # noqa: F401 +from .project.push import project_push # noqa: F401 +from .project.run import project_run # noqa: F401 from .train import train_cli # noqa: F401 from .validate import validate # noqa: F401 diff --git a/spacy/cli/project/__init__.py b/spacy/cli/project/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spacy/cli/project/assets.py b/spacy/cli/project/assets.py new file mode 100644 index 00000000000..591d1959e73 --- /dev/null +++ b/spacy/cli/project/assets.py @@ -0,0 +1 @@ +from weasel.cli.assets import * diff --git a/spacy/cli/project/clone.py b/spacy/cli/project/clone.py new file mode 100644 index 00000000000..11d2511a361 --- /dev/null +++ b/spacy/cli/project/clone.py @@ -0,0 +1 @@ +from weasel.cli.clone import * diff --git a/spacy/cli/project/document.py b/spacy/cli/project/document.py new file mode 100644 index 00000000000..1952524a933 --- /dev/null +++ b/spacy/cli/project/document.py @@ -0,0 +1 @@ +from weasel.cli.document import * diff --git a/spacy/cli/project/dvc.py b/spacy/cli/project/dvc.py new file mode 100644 index 00000000000..aa1ae7dd9ed --- /dev/null +++ b/spacy/cli/project/dvc.py @@ -0,0 +1 @@ +from weasel.cli.dvc import * diff --git a/spacy/cli/project/pull.py b/spacy/cli/project/pull.py new file mode 100644 index 00000000000..5e603273d94 --- /dev/null +++ b/spacy/cli/project/pull.py @@ -0,0 +1 @@ +from weasel.cli.pull import * diff --git a/spacy/cli/project/push.py b/spacy/cli/project/push.py new file mode 100644 index 00000000000..3a8e8869db1 --- /dev/null +++ b/spacy/cli/project/push.py @@ -0,0 +1 @@ +from weasel.cli.push import * diff --git a/spacy/cli/project/remote_storage.py b/spacy/cli/project/remote_storage.py new file mode 100644 index 00000000000..29409150fad --- /dev/null +++ b/spacy/cli/project/remote_storage.py @@ -0,0 +1 @@ +from weasel.cli.remote_storage import * diff --git a/spacy/cli/project/run.py b/spacy/cli/project/run.py new file mode 100644 index 00000000000..cc6a5ac4256 --- /dev/null +++ b/spacy/cli/project/run.py @@ -0,0 +1 @@ +from weasel.cli.run import * From fbe4b7029f792309aef22139a66cfadae4723d86 Mon Sep 17 00:00:00 2001 From: Adriane Boyd Date: Tue, 10 Oct 2023 09:05:32 +0200 Subject: [PATCH 2/2] Fix typing errors, add simple import test --- spacy/cli/__init__.py | 20 +++++++++++--------- spacy/tests/test_cli.py | 5 +++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/spacy/cli/__init__.py b/spacy/cli/__init__.py index 60fe718c7e6..1d402ff0c98 100644 --- a/spacy/cli/__init__.py +++ b/spacy/cli/__init__.py @@ -22,15 +22,17 @@ from .package import package # noqa: F401 from .pretrain import pretrain # noqa: F401 from .profile import profile # noqa: F401 -from .project.assets import project_assets # noqa: F401 -from .project.clone import project_clone # noqa: F401 -from .project.document import project_document # noqa: F401 -from .project.dvc import project_update_dvc # noqa: F401 -from .project.pull import project_pull # noqa: F401 -from .project.push import project_push # noqa: F401 -from .project.run import project_run # noqa: F401 -from .train import train_cli # noqa: F401 -from .validate import validate # noqa: F401 +from .project.assets import project_assets # type: ignore[attr-defined] # noqa: F401 +from .project.clone import project_clone # type: ignore[attr-defined] # noqa: F401 +from .project.document import ( # type: ignore[attr-defined] # noqa: F401 + project_document, +) +from .project.dvc import project_update_dvc # type: ignore[attr-defined] # noqa: F401 +from .project.pull import project_pull # type: ignore[attr-defined] # noqa: F401 +from .project.push import project_push # type: ignore[attr-defined] # noqa: F401 +from .project.run import project_run # type: ignore[attr-defined] # noqa: F401 +from .train import train_cli # type: ignore[attr-defined] # noqa: F401 +from .validate import validate # type: ignore[attr-defined] # noqa: F401 @app.command("link", no_args_is_help=True, deprecated=True, hidden=True) diff --git a/spacy/tests/test_cli.py b/spacy/tests/test_cli.py index 86451317b2b..ff53ed1e1b0 100644 --- a/spacy/tests/test_cli.py +++ b/spacy/tests/test_cli.py @@ -1061,3 +1061,8 @@ def test_debug_data_trainable_lemmatizer_not_annotated(): data = _compile_gold(train_examples, ["trainable_lemmatizer"], nlp, True) assert data["no_lemma_annotations"] == 2 + + +def test_project_api_imports(): + from spacy.cli import project_run + from spacy.cli.project.run import project_run # noqa: F401, F811