explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-01-26 01:04:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix init and remove .dvc/plots

Browse Source
This commit is contained in:
Ines Montani 2020-06-29 20:07:21 +02:00
parent 126050f259
commit 1d2c646e57
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spacy/cli/project.py
View File

@ -21,6 +21,7 @@ from ..util import get_hash, get_checksum
CONFIG_FILE = "project.yml" CONFIG_FILE = "project.yml"
DVC_CONFIG = "dvc.yaml" DVC_CONFIG = "dvc.yaml"
DVC_DIR = ".dvc"
DIRS = [ DIRS = [
"assets", "assets",
"metas", "metas",
@ -88,6 +89,7 @@ def project_clone_cli(
def project_init_cli( def project_init_cli(
path: Path = Arg(..., help="Path to cloned project", exists=True, file_okay=False), path: Path = Arg(..., help="Path to cloned project", exists=True, file_okay=False),
git: bool = Opt(False, "--git", "-G", help="Initialize project as a Git repo"), git: bool = Opt(False, "--git", "-G", help="Initialize project as a Git repo"),
force: bool = Opt(False, "--force", "-F", help="Force initiziation"),
): ):
"""Initialize a project directory with DVC and optionally Git. This should """Initialize a project directory with DVC and optionally Git. This should
typically be taken care of automatically when you run the "project clone" typically be taken care of automatically when you run the "project clone"
@ -95,7 +97,7 @@ def project_init_cli(
be a Git repo, it should be initialized with Git first, before initializing be a Git repo, it should be initialized with Git first, before initializing
DVC. This allows DVC to integrate with Git. DVC. This allows DVC to integrate with Git.
""" """
project_init(path, git=git, silent=True) project_init(path, git=git, force=force, silent=True)
@project_cli.command("assets") @project_cli.command("assets")
@ -246,7 +248,7 @@ def project_clone(
if not dir_path.exists(): if not dir_path.exists():
dir_path.mkdir(parents=True) dir_path.mkdir(parents=True)
if not no_init: if not no_init:
project_init(project_dir, git=git, silent=True) project_init(project_dir, git=git, force=True, silent=True)
msg.good(f"Your project is now ready!", dest) msg.good(f"Your project is now ready!", dest)
print(f"To fetch the assets, run:\n{COMMAND} project assets {dest}") print(f"To fetch the assets, run:\n{COMMAND} project assets {dest}")
@ -255,6 +257,7 @@ def project_init(
project_dir: Path, project_dir: Path,
*, *,
git: bool = False, git: bool = False,
force: bool = False,
silent: bool = False, silent: bool = False,
analytics: bool = False, analytics: bool = False,
): ):
@ -265,19 +268,29 @@ def project_init(
silent (bool): Don't print any output (via DVC). silent (bool): Don't print any output (via DVC).
analytics (bool): Opt-in to DVC analytics (defaults to False). analytics (bool): Opt-in to DVC analytics (defaults to False).
""" """
project_dir = project_dir.resolve()
with working_dir(project_dir): with working_dir(project_dir):
if git:
run_command(["git", "init"])
init_cmd = ["dvc", "init"] init_cmd = ["dvc", "init"]
if silent: if silent:
init_cmd.append("--quiet") init_cmd.append("--quiet")
if not git: if not git:
init_cmd.append("--no-scm") init_cmd.append("--no-scm")
if git: if force:
run_command(["git", "init"]) init_cmd.append("--force")
run_command(init_cmd) run_command(init_cmd)
# We don't want to have analytics on by default – our users should # We don't want to have analytics on by default – our users should
# opt-in explicitly. If they want it, they can always enable it. # opt-in explicitly. If they want it, they can always enable it.
if not analytics: if not analytics:
run_command(["dvc", "config", "core.analytics", "false"]) run_command(["dvc", "config", "core.analytics", "false"])
# Remove unused and confusing plot templates from .dvc directory
# TODO: maybe we shouldn't do this, but it's otherwise super confusing
# once you commit your changes via Git and it creates a bunch of files
# that have no purpose
plots_dir = project_dir / DVC_DIR / "plots"
if plots_dir.exists():
shutil.rmtree(str(plots_dir))
config = load_project_config(project_dir) config = load_project_config(project_dir)
setup_check_dvc(project_dir, config) setup_check_dvc(project_dir, config)