Skip to content

Dvc formatting review #1916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2019
Merged

Dvc formatting review #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41461d4
test: use caplog.at_level() to restore log level after test
Suor Apr 23, 2019
95611ce
dvc: improve apply_diff() docstring
Suor Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion dvc/utils/collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ def compact(args):


def apply_diff(src, dest):
"""Recursively apply changes from stc to dest"""
"""Recursively apply changes from src to dest.

Preserves dest type and hidden info in dest structure,
like ruamel.yaml leaves when parses files. This includes comments,
ordering and line foldings.

Used in Stage load/dump cycle to preserve comments and custom formatting.
"""
Seq = (list, tuple)
Container = (Mapping, list, tuple)

Expand Down
7 changes: 4 additions & 3 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
from git.exc import GitCommandNotFound

from dvc.repo import Repo as DvcRepo
from .basic_env import TestDirFixture, logger
from .basic_env import TestDirFixture


@pytest.fixture(autouse=True)
def debug():
logger.setLevel("DEBUG")
def debug(caplog):
with caplog.at_level("DEBUG", logger="dvc"):
yield


# Wrap class like fixture as pytest-like one to avoid code duplication
Expand Down