Move toml/yaml serialization to dvc.utils.serialize (#4411)

This commit is contained in:
Saugat Pachhai
2020-08-18 13:01:16 +05:45
committed by GitHub
parent 8cd4eeac18
commit e31364979b
21 changed files with 25 additions and 19 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ from dvc.stage.exceptions import (
from dvc.stage.loader import SingleStageLoader, StageLoader
from dvc.utils import relpath
from dvc.utils.collections import apply_diff
from dvc.utils.yaml import dump_yaml, parse_yaml, parse_yaml_for_update
from dvc.utils.serialize import dump_yaml, parse_yaml, parse_yaml_for_update
logger = logging.getLogger(__name__)
+6 -2
View File
@@ -189,8 +189,12 @@ class Experiments:
def _update_params(self, params: dict):
"""Update experiment params files with the specified values."""
from dvc.utils.toml import dump_toml, parse_toml_for_update
from dvc.utils.yaml import dump_yaml, parse_yaml_for_update
from dvc.utils.serialize import (
dump_toml,
dump_yaml,
parse_toml_for_update,
parse_yaml_for_update,
)
logger.debug("Using experiment params '%s'", params)
+1 -1
View File
@@ -10,7 +10,7 @@ from dvc.cache.local import _log_exceptions
from dvc.schema import COMPILED_LOCK_FILE_STAGE_SCHEMA
from dvc.utils import dict_sha256, relpath
from dvc.utils.fs import makedirs
from dvc.utils.yaml import dump_yaml
from dvc.utils.serialize import dump_yaml
from .loader import StageLoader
from .serialize import to_single_stage_lockfile
+1 -1
View File
@@ -8,7 +8,7 @@ from funcy import post_processing
from dvc.dependency import ParamsDependency
from dvc.output import BaseOutput
from dvc.utils.collections import apply_diff
from dvc.utils.yaml import parse_yaml_for_update
from dvc.utils.serialize import parse_yaml_for_update
from .params import StageParams
from .utils import resolve_wdir, split_params_deps
+2
View File
@@ -0,0 +1,2 @@
from ._toml import * # noqa, pylint: disable=wildcard-import
from ._yaml import * # noqa, pylint: disable=wildcard-import
+1 -1
View File
@@ -27,7 +27,7 @@ from dvc.system import System
from dvc.tree.local import LocalTree
from dvc.utils import LARGE_DIR_SIZE, file_md5, relpath
from dvc.utils.fs import path_isin
from dvc.utils.yaml import load_yaml
from dvc.utils.serialize import load_yaml
from tests.basic_env import TestDvc
from tests.utils import get_gitignore_content
+1 -1
View File
@@ -26,7 +26,7 @@ from dvc.tree.local import LocalTree
from dvc.tree.s3 import S3Tree
from dvc.utils import relpath
from dvc.utils.fs import walk_files
from dvc.utils.yaml import dump_yaml, load_yaml
from dvc.utils.serialize import dump_yaml, load_yaml
from tests.basic_env import TestDvc, TestDvcGit
from tests.func.test_repro import TestRepro
from tests.remotes import S3
+1 -1
View File
@@ -6,7 +6,7 @@ from dvc.dependency.base import DependencyDoesNotExistError
from dvc.dvcfile import PIPELINE_FILE
from dvc.output.base import OutputDoesNotExistError
from dvc.stage.exceptions import StageCommitError
from dvc.utils.yaml import dump_yaml, load_yaml
from dvc.utils.serialize import dump_yaml, load_yaml
def test_commit_recursive(tmp_dir, dvc):
+1 -1
View File
@@ -17,7 +17,7 @@ from dvc.main import main
from dvc.stage.exceptions import StageNotFound
from dvc.tree.local import LocalTree
from dvc.utils.fs import move, remove
from dvc.utils.yaml import dump_yaml, load_yaml
from dvc.utils.serialize import dump_yaml, load_yaml
from .test_api import all_clouds
+1 -1
View File
@@ -9,7 +9,7 @@ from dvc.stage.exceptions import (
StageFileFormatError,
)
from dvc.stage.loader import StageNotFound
from dvc.utils.yaml import dump_yaml
from dvc.utils.serialize import dump_yaml
def test_run_load_one_for_multistage(tmp_dir, dvc):
+1 -1
View File
@@ -6,7 +6,7 @@ import yaml
from dvc.dvcfile import PIPELINE_LOCK
from dvc.stage.utils import split_params_deps
from dvc.utils.fs import remove
from dvc.utils.yaml import parse_yaml_for_update
from dvc.utils.serialize import parse_yaml_for_update
from tests.func.test_run_multistage import supported_params
FS_STRUCTURE = {
+1 -1
View File
@@ -3,7 +3,7 @@ import os
from dvc.dvcfile import DVC_FILE_SUFFIX
from dvc.exceptions import DvcException, MoveNotDataSourceError
from dvc.main import main
from dvc.utils.yaml import load_yaml
from dvc.utils.serialize import load_yaml
from tests.basic_env import TestDvc, TestDvcGit
from tests.func.test_repro import TestRepro
from tests.utils import cd
+1 -1
View File
@@ -21,7 +21,7 @@ from dvc.system import System
from dvc.tree.local import LocalTree
from dvc.utils import file_md5, relpath
from dvc.utils.fs import remove
from dvc.utils.yaml import dump_yaml, load_yaml
from dvc.utils.serialize import dump_yaml, load_yaml
from tests.basic_env import TestDvc
+1 -1
View File
@@ -10,7 +10,7 @@ from dvc.dvcfile import PIPELINE_FILE, PIPELINE_LOCK
from dvc.exceptions import CyclicGraphError
from dvc.main import main
from dvc.stage import PipelineStage
from dvc.utils.yaml import dump_yaml, parse_yaml
from dvc.utils.serialize import dump_yaml, parse_yaml
from tests.func import test_repro
COPY_SCRIPT_FORMAT = dedent(
+1 -1
View File
@@ -7,7 +7,7 @@ import yaml
from dvc.exceptions import InvalidArgumentError
from dvc.repo import Repo
from dvc.stage.exceptions import DuplicateStageName, InvalidStageName
from dvc.utils.yaml import parse_yaml_for_update
from dvc.utils.serialize import parse_yaml_for_update
def test_run_with_name(tmp_dir, dvc, run_copy):
+1 -1
View File
@@ -32,7 +32,7 @@ from dvc.stage.exceptions import (
)
from dvc.system import System
from dvc.utils import file_md5
from dvc.utils.yaml import load_yaml
from dvc.utils.serialize import load_yaml
from tests.basic_env import TestDvc, TestDvcGit
+1 -1
View File
@@ -10,7 +10,7 @@ from dvc.repo import Repo
from dvc.stage import PipelineStage, Stage
from dvc.stage.exceptions import StageFileFormatError
from dvc.tree.local import LocalTree
from dvc.utils.yaml import dump_yaml, load_yaml
from dvc.utils.serialize import dump_yaml, load_yaml
from tests.basic_env import TestDvc
+1 -1
View File
@@ -5,7 +5,7 @@ import yaml
from dvc.dependency import ParamsDependency, loadd_from, loads_params
from dvc.dependency.param import BadParamFileError, MissingParamsError
from dvc.stage import Stage
from dvc.utils.yaml import load_yaml
from dvc.utils.serialize import load_yaml
PARAMS = {
"foo": 1,
+1 -1
View File
@@ -13,7 +13,7 @@ from dvc.stage.exceptions import (
StageFileFormatError,
StageFileIsNotDvcFileError,
)
from dvc.utils.yaml import dump_yaml
from dvc.utils.serialize import dump_yaml
@pytest.mark.parametrize(