Skip to content

Commit

Permalink
Merge pull request #436 from lgray/pr435_backport
Browse files Browse the repository at this point in the history
Backport of: Fix reading from CSV for numpy 1.20.0
  • Loading branch information
lgray committed Feb 1, 2021
2 parents 00ef986 + 6a611b0 commit 36f4ce7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion coffea/lookup_tools/csv_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def convert_btag_csv_file(csvFilePath):
},
delimiter=",",
skip_header=1,
unpack=True,
encoding="ascii",
)

Expand Down
2 changes: 0 additions & 2 deletions coffea/lookup_tools/txt_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ def _parse_jme_formatted_file(
jme_f,
dtype=tuple(dtypes),
names=tuple(columns),
unpack=True,
encoding="ascii",
)
if len(pars.shape) == 0:
Expand Down Expand Up @@ -424,7 +423,6 @@ def convert_effective_area_file(eaFilePath):
dtype=tuple(dtypes),
names=tuple(columns),
skip_header=1,
unpack=True,
encoding="ascii",
)

Expand Down

0 comments on commit 36f4ce7

Please sign in to comment.