From 4260a6246d7f2a77cc21d89027c99f9b95bee8c9 Mon Sep 17 00:00:00 2001 From: Brett Barkley Date: Sun, 28 Apr 2019 08:58:11 -0400 Subject: [PATCH] dvc metrics show: implement jsonpath-ng updated setup.py updated test_metrics.py::assertMetricsHaveRelativePaths Fixes #1919 --- setup.py | 2 +- tests/func/test_metrics.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c12d8803f..fb4a66eef 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ install_requires = [ "nanotime>=0.5.2", "pyasn1>=0.4.1", "schema>=0.6.7", - "jsonpath-rw==1.4.0", + "jsonpath-ng>=1.4.3", "requests>=2.18.4", "grandalf==0.6", "asciimatics>=1.10.0", diff --git a/tests/func/test_metrics.py b/tests/func/test_metrics.py index 4caa16794..35249add4 100644 --- a/tests/func/test_metrics.py +++ b/tests/func/test_metrics.py @@ -343,6 +343,7 @@ class TestMetrics(TestDvc): metric_htsv_path = os.path.join(root_relpath, "metric_htsv") metric_csv_path = os.path.join(root_relpath, "metric_csv") metric_hcsv_path = os.path.join(root_relpath, "metric_hcsv") + metric_json_ext_path = os.path.join(root_relpath, "metric_json_ext") for branch in ["bar", "baz", "foo"]: self.assertEqual( set(metrics[branch].keys()), @@ -353,6 +354,7 @@ class TestMetrics(TestDvc): metric_htsv_path, metric_csv_path, metric_hcsv_path, + metric_json_ext_path, }, )