From b63abc451681f98211df4b4b336d46eb4460e60a Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sat, 15 Jan 2022 08:20:38 +0200 Subject: [PATCH 1/2] Add a new MPR test file which contains column 174 'Ewe/V' --- tests/test_BioLogic.py | 1 + tests/testdata/Ewe_Error.mpr | 3 +++ tests/testdata/Ewe_Error.mpr.license | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 tests/testdata/Ewe_Error.mpr create mode 100644 tests/testdata/Ewe_Error.mpr.license diff --git a/tests/test_BioLogic.py b/tests/test_BioLogic.py index 77b71bb..a739f5f 100644 --- a/tests/test_BioLogic.py +++ b/tests/test_BioLogic.py @@ -106,6 +106,7 @@ def test_parse_BioLogic_date(data, expected): # C019P-0ppb-A_C01.mpr stores the date in a different format ('C019P-0ppb-A_C01.mpr', '2019-03-14', '2019-03-14'), ('Rapp_Error.mpr', '2010-12-02', '2010-12-02'), + ('Ewe_Error.mpr', '2021-11-18', '2021-11-19'), ]) def test_MPR_dates(testdata_dir, filename, startdate, enddate): """Check that the start and end dates in .mpr files are read correctly.""" diff --git a/tests/testdata/Ewe_Error.mpr b/tests/testdata/Ewe_Error.mpr new file mode 100644 index 0000000..90b910d --- /dev/null +++ b/tests/testdata/Ewe_Error.mpr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf6db89c692814232ec5e1420450518eff778a8bac638a78f7bc441da2b88f42 +size 4050615 diff --git a/tests/testdata/Ewe_Error.mpr.license b/tests/testdata/Ewe_Error.mpr.license new file mode 100644 index 0000000..e5a360a --- /dev/null +++ b/tests/testdata/Ewe_Error.mpr.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText Danzi Federico +SPDX-License-Identifier CC-BY-4.0 From c1e5d92ed08d2fd9e245c419d267ec807a4991b4 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sat, 15 Jan 2022 08:21:24 +0200 Subject: [PATCH 2/2] Add column 174 'Ewe/V' to parser Suggested by @Etruria89 to fix #67 --- galvani/BioLogic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py index 5e6e92f..8c7c047 100644 --- a/galvani/BioLogic.py +++ b/galvani/BioLogic.py @@ -185,6 +185,7 @@ def MPTfileCSV(file_or_path): 169: ('Cs/µF', '