Skip to content

Commit 4b60506

Browse files
committed
deprecate YAML as diff values formatter
1 parent defc08d commit 4b60506

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Run essential tests
3939
if: ${{ matrix.tests != 'extended' }}
4040
run: |
41-
pip install --quiet -e '.[cli,test]'
41+
pip install -e '.[cli,test]'
4242
pytest
4343
4444
- name: Run extra linters and report coverage

nested_diff/diff_tool.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import argparse
1818
import os
1919
import sys
20+
import warnings
2021

2122
import nested_diff
2223
import nested_diff.cli
@@ -152,7 +153,8 @@ def get_optional_args_parser(self):
152153
default='repr',
153154
help='values format; "none" means no values printed, "repr" is a '
154155
'python representation of the object, rest are themselves; default'
155-
' is "%(default)s"',
156+
' is "%(default)s". NOTE: yaml is deprecated here due to explicit'
157+
' ends for scalar values in yaml v1.2',
156158
)
157159

158160
parser.add_argument(
@@ -333,6 +335,14 @@ def __init__(self, *args, **kwargs):
333335
if values == 'json':
334336
self.__val_encoder = nested_diff.cli.JsonDumper(indent=2)
335337
elif values == 'yaml':
338+
warnings.warn(
339+
(
340+
'YAML as diff values formatter is deprecated and'
341+
' will be removed soon'
342+
),
343+
FutureWarning,
344+
stacklevel=3,
345+
)
336346
self.__val_encoder = nested_diff.cli.YamlDumper(
337347
explicit_start=False,
338348
)

tests/cli/test_diff_tool.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,10 @@ def test_values_json(capsys, expected, rpath):
714714
assert captured.out == expected
715715

716716

717+
@pytest.mark.skipif(
718+
sys.implementation.name == 'pypy',
719+
reason='--values yaml is deprecated (produce explicit ends on pypy 3.8)',
720+
)
717721
def test_values_yaml(capsys, expected, rpath):
718722
exit_code = nested_diff.diff_tool.App(
719723
args=(

0 commit comments

Comments
 (0)