Skip to content

Commit

Permalink
Merge branch 'DFO_issues' of https://github.com/upsonp/python-ctd int…
Browse files Browse the repository at this point in the history
…o DFO_issues
  • Loading branch information
upsonp committed May 31, 2022
2 parents b538acb + 180f761 commit ea03856
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ctd/read.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def _parse_seabird(lines, ftype):
names.append("Statistic")
metadata.update(
{
"name": fname if fname else "default_file",
"name": fname if fname else "unknown",
"header": "\n".join(header),
"config": "\n".join(config),
"names": _remane_duplicate_columns(names),
Expand Down
4 changes: 1 addition & 3 deletions tests/test_read.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ def test_btl_is_dataframe(btl):


def test_btl_with_dup_cols(btl_as_stream):
assert all(
col in btl_as_stream.columns for col in ["Bottle", "Bottle_"]
)
assert all(col in btl_as_stream.columns for col in ["Bottle", "Bottle_"])


def test_btl_as_stringio(btl_as_stream):
Expand Down

0 comments on commit ea03856

Please sign in to comment.