From e2ee69ddb235b354e693a542cc9470d95e842c1d Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Mon, 25 Apr 2022 18:02:33 +0900 Subject: [PATCH] dvc-task: update to 0.0.6 --- dvc/repo/experiments/queue/celery.py | 43 ---------------------------- setup.cfg | 2 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 dvc/repo/experiments/queue/celery.py diff --git a/dvc/repo/experiments/queue/celery.py b/dvc/repo/experiments/queue/celery.py deleted file mode 100644 index 3cd4fe173..000000000 --- a/dvc/repo/experiments/queue/celery.py +++ /dev/null @@ -1,43 +0,0 @@ -import os -from typing import Any, Dict - -from dvc.utils.fs import makedirs - - -def get_config(wdir: str, mkdir=False) -> Dict[str, Any]: - broker_path = os.path.join(wdir, "broker") - broker_in_path = _unc_path(os.path.join(broker_path, "in")) - broker_processed_path = _unc_path(os.path.join(broker_path, "processed")) - result_path = os.path.join(wdir, "result") - - if mkdir: - for path in (broker_in_path, broker_processed_path, result_path): - makedirs(path, exist_ok=True) - - return { - "broker_url": "filesystem://", - "broker_transport_options": { - "data_folder_in": broker_in_path, - "data_folder_out": broker_in_path, - "processed_folder": broker_processed_path, - "store_processed": True, - }, - "result_backend": "file://{}".format(_unc_path(result_path)), - "result_persistent": True, - "task_serializer": "json", - "result_serializer": "json", - "accept_content": ["json"], - "imports": ("dvc.repo.experiments.queue.tasks", "dvc_task.proc.tasks"), - } - - -def _unc_path(path: str) -> str: - # Celery/Kombu URLs only take absolute filesystem paths - # (UNC paths on windows) - path = os.path.abspath(path) - if os.name != "nt": - return path - drive, tail = os.path.splitdrive(path.replace(os.sep, "/")) - if drive.endswith(":"): - return f"//?/{drive}{tail}" - return f"{drive}{tail}" diff --git a/setup.cfg b/setup.cfg index 7ed436c12..c2289012d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -67,7 +67,7 @@ install_requires = aiohttp-retry>=2.4.5 scmrepo==0.0.25 dvc-render==0.0.6 - dvc-task>=0.0.3 + dvc-task@git+https://github.com/iterative/dvc-task.git@0.0.6 dvclive>=0.7.3 dvc-data==0.0.23