Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

pre-commit: update black to 21.5b1 (#6032)

Browse Source 
* pre-commit: update black to 21.5b1

also updated others, but black is more noticeable

* remove magic trailing comma
This commit is contained in:
Saugat Pachhai
2021-05-18 15:51:15 +00:00
committed by GitHub
parent 58c465ef13
commit b9000ed926
154 changed files with 346 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/func/test_merge_driver.py
+6 -6
View File
@@ -33,12 +33,12 @@ def _gen(tmp_dir, struct, name):
"subdir": {"foo": "foo", "bar": "bar", "baz": "baz"},
},
),
({}, {"foo": "foo"}, {"bar": "bar"}, {"foo": "foo", "bar": "bar"},),
({}, {}, {"bar": "bar"}, {"bar": "bar"},),
({}, {"foo": "foo"}, {}, {"foo": "foo"},),
(None, {"foo": "foo"}, {"bar": "bar"}, {"foo": "foo", "bar": "bar"},),
(None, None, {"bar": "bar"}, {"bar": "bar"},),
(None, {"foo": "foo"}, None, {"foo": "foo"},),
({}, {"foo": "foo"}, {"bar": "bar"}, {"foo": "foo", "bar": "bar"}),
({}, {}, {"bar": "bar"}, {"bar": "bar"}),
({}, {"foo": "foo"}, {}, {"foo": "foo"}),
(None, {"foo": "foo"}, {"bar": "bar"}, {"foo": "foo", "bar": "bar"}),
(None, None, {"bar": "bar"}, {"bar": "bar"}),
(None, {"foo": "foo"}, None, {"foo": "foo"}),
],
)
def test_merge(tmp_dir, dvc, ancestor, our, their, merged):