mirror of
https://github.com/explosion/spaCy.git
synced 2024-12-26 18:06:29 +03:00
Merge branch 'develop' of https://github.com/explosion/spaCy into develop
This commit is contained in:
commit
db12ee4da9
|
@ -242,12 +242,16 @@ def project_clone(
|
||||||
try:
|
try:
|
||||||
run_command(cmd)
|
run_command(cmd)
|
||||||
except SystemExit:
|
except SystemExit:
|
||||||
err = f"Could not clone the repo '{repo}' into the temp dir '{tmp_dir}'"
|
err = f"Could not clone the repo '{repo}' into the temp dir '{tmp_dir}'."
|
||||||
msg.fail(err)
|
msg.fail(err)
|
||||||
with (tmp_dir / ".git" / "info" / "sparse-checkout").open("w") as f:
|
with (tmp_dir / ".git" / "info" / "sparse-checkout").open("w") as f:
|
||||||
f.write(name)
|
f.write(name)
|
||||||
|
try:
|
||||||
run_command(["git", "-C", str(tmp_dir), "fetch"])
|
run_command(["git", "-C", str(tmp_dir), "fetch"])
|
||||||
run_command(["git", "-C", str(tmp_dir), "checkout"])
|
run_command(["git", "-C", str(tmp_dir), "checkout"])
|
||||||
|
except SystemExit:
|
||||||
|
err = f"Could not clone '{name}' in the repo '{repo}'."
|
||||||
|
msg.fail(err)
|
||||||
shutil.move(str(tmp_dir / Path(name).name), str(project_dir))
|
shutil.move(str(tmp_dir / Path(name).name), str(project_dir))
|
||||||
msg.good(f"Cloned project '{name}' from {repo} into {project_dir}")
|
msg.good(f"Cloned project '{name}' from {repo} into {project_dir}")
|
||||||
for sub_dir in DIRS:
|
for sub_dir in DIRS:
|
||||||
|
@ -525,9 +529,9 @@ def update_dvc_config(
|
||||||
outputs_no_cache = command.get("outputs_no_cache", [])
|
outputs_no_cache = command.get("outputs_no_cache", [])
|
||||||
if not deps and not outputs and not outputs_no_cache:
|
if not deps and not outputs and not outputs_no_cache:
|
||||||
continue
|
continue
|
||||||
# Default to "." as the project path since dvc.yaml is auto-generated
|
# Default to the working dir as the project path since dvc.yaml is auto-generated
|
||||||
# and we don't want arbitrary paths in there
|
# and we don't want arbitrary paths in there
|
||||||
project_cmd = ["python", "-m", NAME, "project", ".", "exec", name]
|
project_cmd = ["python", "-m", NAME, "project", "exec", name]
|
||||||
deps_cmd = [c for cl in [["-d", p] for p in deps] for c in cl]
|
deps_cmd = [c for cl in [["-d", p] for p in deps] for c in cl]
|
||||||
outputs_cmd = [c for cl in [["-o", p] for p in outputs] for c in cl]
|
outputs_cmd = [c for cl in [["-o", p] for p in outputs] for c in cl]
|
||||||
outputs_nc_cmd = [c for cl in [["-O", p] for p in outputs_no_cache] for c in cl]
|
outputs_nc_cmd = [c for cl in [["-O", p] for p in outputs_no_cache] for c in cl]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user