Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions dvc/command/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ def _add_props_arguments(parser):
parser.add_argument("-x", default=None, help="Field name for x axis.")
parser.add_argument("-y", default=None, help="Field name for y axis.")
parser.add_argument(
"--no-csv-header",
"--no-header",
action="store_false",
dest="csv_header",
dest="header",
default=None, # Use default None to distinguish when it's not used
help="Provided CSV ot TSV datafile does not have a header.",
help="Provided CSV or TSV datafile does not have a header.",
)
parser.add_argument(
"--title", default=None, metavar="<text>", help="Plot title."
Expand Down
2 changes: 1 addition & 1 deletion dvc/output/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class BaseOutput:
PARAM_PLOT_X_LABEL = "x_label"
PARAM_PLOT_Y_LABEL = "y_label"
PARAM_PLOT_TITLE = "title"
PARAM_PLOT_CSV_HEADER = "csv_header"
PARAM_PLOT_HEADER = "header"
PARAM_PERSIST = "persist"

METRIC_SCHEMA = Any(
Expand Down
4 changes: 2 additions & 2 deletions dvc/repo/plots/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def collect(self, targets=None, revs=None):

Returns a structure like:
{rev: {plots.csv: {
props: {x: ..., "csv_header": ..., ...},
props: {x: ..., "header": ..., ...},
data: "...data as a string...",
}}}
Data parsing is postponed, since it's affected by props.
Expand Down Expand Up @@ -200,7 +200,7 @@ def _render(datafile, datas, props, templates):
rev_data = plot_data(datafile, rev, datablob).to_datapoints(
fields=fields,
path=props.get("path"),
csv_header=props.get("csv_header", True),
header=props.get("header", True),
append_index=props.get("append_index", False),
)
data.extend(rev_data)
Expand Down
4 changes: 2 additions & 2 deletions dvc/repo/plots/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ def __init__(self, filename, revision, content, delimiter=","):
super().__init__(filename, revision, content)
self.delimiter = delimiter

def raw(self, csv_header=True, **kwargs):
def raw(self, header=True, **kwargs):
first_row = first(csv.reader(io.StringIO(self.content)))

if csv_header:
if header:
reader = csv.DictReader(
io.StringIO(self.content), delimiter=self.delimiter,
)
Expand Down
2 changes: 1 addition & 1 deletion dvc/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
BaseOutput.PARAM_PLOT_X_LABEL: str,
BaseOutput.PARAM_PLOT_Y_LABEL: str,
BaseOutput.PARAM_PLOT_TITLE: str,
BaseOutput.PARAM_PLOT_CSV_HEADER: bool,
BaseOutput.PARAM_PLOT_HEADER: bool,
}
PLOT_PROPS_SCHEMA = {
**OUT_PSTAGE_DETAILED_SCHEMA[str],
Expand Down
2 changes: 1 addition & 1 deletion tests/func/plots/test_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_plot_csv_one_column(tmp_dir, scm, dvc, run_copy_metrics):
)

props = {
"csv_header": False,
"header": False,
"x_label": "x_title",
"y_label": "y_title",
"title": "mytitle",
Expand Down
5 changes: 2 additions & 3 deletions tests/unit/command/test_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_metrics_show(dvc, mocker):
"-t",
"template",
"--show-vega",
"--no-csv-header",
"--no-header",
"datafile",
]
)
Expand All @@ -79,8 +79,7 @@ def test_metrics_show(dvc, mocker):
assert cmd.run() == 0

m.assert_called_once_with(
targets=["datafile"],
props={"template": "template", "csv_header": False},
targets=["datafile"], props={"template": "template", "header": False},
)


Expand Down