From 88dd02bc1d5a619199a10d1cfe26a8a9198b209f Mon Sep 17 00:00:00 2001 From: Patrick Upson Date: Wed, 11 May 2022 09:05:48 -0300 Subject: [PATCH 1/6] fixed issues #138 and #139 --- ctd/read.py | 10 +- .../test_plotting.cpython-38-pytest-7.1.2.pyc | Bin 0 -> 2781 bytes .../__pycache__/test_plotting.cpython-38.pyc | Bin 0 -> 1986 bytes ...est_processing.cpython-38-pytest-7.1.2.pyc | Bin 0 -> 10579 bytes ...sing_real_data.cpython-38-pytest-7.1.2.pyc | Bin 0 -> 3539 bytes .../test_read.cpython-38-pytest-7.1.2.pyc | Bin 0 -> 6499 bytes tests/data/btl/alt_bottletest.BTL | 335 ++++++++++++++++++ tests/test_read.py | 5 + 8 files changed, 346 insertions(+), 4 deletions(-) create mode 100644 tests/__pycache__/test_plotting.cpython-38-pytest-7.1.2.pyc create mode 100644 tests/__pycache__/test_plotting.cpython-38.pyc create mode 100644 tests/__pycache__/test_processing.cpython-38-pytest-7.1.2.pyc create mode 100644 tests/__pycache__/test_processing_real_data.cpython-38-pytest-7.1.2.pyc create mode 100644 tests/__pycache__/test_read.cpython-38-pytest-7.1.2.pyc create mode 100644 tests/data/btl/alt_bottletest.BTL diff --git a/ctd/read.py b/ctd/read.py index 5eae33c..442e22a 100644 --- a/ctd/read.py +++ b/ctd/read.py @@ -90,9 +90,10 @@ def _remane_duplicate_columns(names): if count > 1: dup.append(item) - second_occurrences = [names[::-1].index(item) for item in dup] + # since we can assume there are only two instances of a word in the list, how about we find the last + # index of an instance, which will be the second occurence of the item + second_occurrences = [len(names) - names[::-1].index(item) - 1 for item in dup] for idx in second_occurrences: - idx += 1 names[idx] = f"{names[idx]}_" return names @@ -245,8 +246,9 @@ def from_btl(fname): # Get row types, see what you have: avg, std, min, max or just avg, std. rowtypes = df[df.columns[-1]].unique() # Get times and dates which occur on second line of each bottle. - dates = df.iloc[:: len(rowtypes), 1].reset_index(drop=True) - times = df.iloc[1 :: len(rowtypes), 1].reset_index(drop=True) + date_idx = metadata['names'].index('Date') + dates = df.iloc[:: len(rowtypes), date_idx].reset_index(drop=True) + times = df.iloc[1 :: len(rowtypes), date_idx].reset_index(drop=True) datetimes = dates + " " + times # Fill the Date column with datetimes. diff --git a/tests/__pycache__/test_plotting.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_plotting.cpython-38-pytest-7.1.2.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4ab017441a855f24b5334d0d0d2e69dc15eca12b GIT binary patch literal 2781 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 literal 0 HcmV?d00001 diff --git a/tests/__pycache__/test_processing.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_processing.cpython-38-pytest-7.1.2.pyc new file mode 100644 index 0000000000000000000000000000000000000000..856c01c9c8036f5655f2505cd6943d052a2d3ef1 GIT binary patch literal 10579 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 literal 0 HcmV?d00001 diff --git a/tests/__pycache__/test_processing_real_data.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_processing_real_data.cpython-38-pytest-7.1.2.pyc new file mode 100644 index 0000000000000000000000000000000000000000..de5eeaf97e84b2f1c0260090a5b871666b99ff61 GIT binary patch literal 3539 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 literal 0 HcmV?d00001 diff --git a/tests/__pycache__/test_read.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_read.cpython-38-pytest-7.1.2.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7164b898769b964097c27f0adf61c4c5e500814e GIT binary patch literal 6499 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 +** Ship: HUDSON +** Cruise: HUD2021185 +** Chief_Scientist: CHANTELLE LAYTON +** Organization: BIO +** Area_of_Operation: SCOTIAN SHELF +** Cruise_Description: ATLANTIC ZONE MONITORING PROGRAM (AZMP) +** Station_Name: 007 +** Event_Number: 007 +** Sounding: 148 +** Event_Comments: HL_02,488275 +* System UTC = Sep 17 2021 03:38:32 +* Surface_Pressure_Offset = 0.774, Temperature = 18.5245, Scan = 5463.0 +* Near_Surface_Scan = 5487.0, P = 0.878, T = 18.5461, S = 22.1669 +# interval = seconds: 0.0416667 +# start_time = Sep 17 2021 03:38:31 [NMEA time, header] +# +# +# +# +# 5083 +# 06-Nov-2020 +# +# 0 +# 3.68121154e-003 +# 5.97282277e-004 +# 1.50761235e-005 +# 2.04865165e-006 +# 2984.665 +# 4.35484023e-003 +# 6.37393260e-004 +# 2.17650031e-005 +# 2.04721418e-006 +# 1000.000 +# 1.00000000 +# 0.0000 +# +# +# +# +# +# 3562 +# 10-Nov-2020 +# 1 +# +# 0.0000 +# 2000.0000 +# 0 +# +# 0.00000000e+000 +# 0.00000000e+000 +# 0.00000000e+000 +# 0.00000000e+000 +# 0.0 +# -9.57000000e-008 +# +# +# -9.86623986e+000 +# 1.20518686e+000 +# -1.87726883e-003 +# 1.83608664e-004 +# -9.57000000e-008 +# 3.2500e-006 +# +# 0.00000000e+000 +# +# 1.00024000 +# -0.00124 +# +# +# +# +# +# 50601-0370 +# 20-Jan-2021 +# -4.274542e+004 +# 1.040996e+000 +# 1.266000e-002 +# 4.087300e-002 +# 0.000000e+000 +# 3.009606e+001 +# -6.521164e-005 +# 4.345040e-006 +# 2.428830e-009 +# 0.99996291 +# -0.35347 +# 0.000000e+000 +# 1.289670e-002 +# -8.390788e+000 +# +# +# +# +# +# 5081 +# 02-Dec-2020 +# +# 0 +# 3.68050257e-003 +# 6.01375916e-004 +# 1.56245547e-005 +# 2.05531937e-006 +# 3246.733 +# 4.41352149e-003 +# 6.46511212e-004 +# 2.28532525e-005 +# 2.05383168e-006 +# 1000.000 +# 1.00000000 +# 0.0000 +# +# +# +# +# +# 3561 +# 10-Nov-2020 +# 1 +# +# 0.0000 +# 2000.0000 +# 0 +# +# 0.00000000e+000 +# 0.00000000e+000 +# 0.00000000e+000 +# 0.00000000e+000 +# 0.0 +# -9.57000000e-008 +# +# +# -1.03650868e+001 +# 1.25241992e+000 +# -2.47281184e-003 +# 2.28722834e-004 +# -9.57000000e-008 +# 3.2500e-006 +# +# 0.00000000e+000 +# +# 1.00008000 +# -0.00073 +# +# +# +# +# +# 59017 +# 01-Mar-2017 +# 15.000 +# 0.000 +# +# +# +# +# +# 1043 +# 01-Dec-2015 +# 1.03320000 +# 0.80737000 +# 1.35890000 +# 1.00000000 +# +# +# +# +# +# 2524 +# 23-Dec-2020 +# 1 +# +# +# 0.0000 +# 0.0000e+000 +# 0.0000 +# 0.00e+000 +# 0.0000 +# 0.0 +# +# +# +# 5.0830e-001 +# -0.5100 +# -3.9982e-003 +# 1.9704e-004 +# -3.0858e-006 +# 2.5826e+000 +# 1.92634e-004 +# -4.64803e-002 +# 3.6000e-002 +# 1.0200 +#

-3.3000e-002

+#

5.0000e+003

+#

1.4500e+003

+#
+#
+#
+# +# +# +# 3026 +# 23-Dec-2020 +# 1 +# +# +# 0.0000 +# 0.0000e+000 +# 0.0000 +# 0.00e+000 +# 0.0000 +# 0.0 +# +# +# +# 5.1700e-001 +# -0.5144 +# -4.6229e-003 +# 2.2368e-004 +# -3.3916e-006 +# 2.5826e+000 +# 1.92634e-004 +# -4.64803e-002 +# 3.6000e-002 +# 1.6800 +#

-3.3000e-002

+#

5.0000e+003

+#

1.4500e+003

+#
+#
+#
+# +# +# +# 3668 +# 1-Jan-2015 +# 50.0 +# 0.0000 +# +# +# +# +# +# 6210 +# 1-Jan-2015 +# +# 2 +# 0.000 +# +# +# +# +# +# 1221 +# 16-Nov-2020 +# 4.6226 +# 2.4930 +# +# +# +# +# +# 1490 +# 9-Aug-2016 +# 2.983e-003 +# +# 4.800e-002 +# +# +# +# +# +# +# +# +# 1069 +# 24-Jun-2016 +# 1.00000000 +# 1.00000000 +# +# +#
+# datcnv_date = Jan 13 2022 08:44:01, 7.26.6.28 +# datcnv_in = C:\DEV\Data\2021\HUD2021185\CTD\DATASHOP_PROCESSING\Step_0_Recalibrated_Data\CTDDATA\185a007.hex C:\DEV\Data\2021\HUD2021185\CTD\DATASHOP_PROCESSING\Step_0_Recalibrated_Data\HUD2021185_Events_001_to_117_Corrected.xmlcon +# datcnv_ox_hysteresis_correction = yes +# datcnv_bottle_scan_range_source = BL file +# datcnv_scans_per_bottle = 49 +# bottlesum_date = Jan 13 2022 08:51:21, 7.26.6.28 +# bottlesum_in = C:\DEV\Data\2021\HUD2021185\CTD\DATASHOP_PROCESSING\Step_0_Recalibrated_Data\CTDDATA\185a007.ros C:\DEV\Data\2021\HUD2021185\CTD\DATASHOP_PROCESSING\Step_0_Recalibrated_Data\HUD2021185_Events_001_to_117_Corrected.xmlcon C:\DEV\Data\2021\HUD2021185\CTD\DATASHOP_PROCESSING\Step_0_Recalibrated_Data\CTDDATA\185a007.BL +# bottlesum_ox_tau_correction = yes + Bottle Bottle Date Sbeox0ML/L Sbeox1ML/L Sal00 Sal11 Potemp068C Potemp168C Sigma-é00 Sigma-é11 Scan TimeS PrDM T068C C0S/m T168C C1S/m AltM Par/log Sbeox0V Sbeox1V FlSPuv0 FlSP Ph TurbWETbb0 Spar Latitude Longitude + Position S/N Time + 1 488275 Sep 17 2021 3.6759 3.6754 34.4673 34.4748 9.6059 9.6130 26.6026 26.6073 17690 737.042 144.655 9.6221 3.727925 9.6292 3.729318 6.26 1.0039e-01 1.6505 1.6371 2.5043 3.6630e-02 7.910 9.4191e-04 1.2454e-01 44.26730 -63.31760 (avg) + 03:50:48 14 0.595 0.079 0.0085 0.001062 0.0031 0.000408 0.12 0.0000e+00 0.0012 0.0002 0.0195 0.0000e+00 0.000 7.2788e-06 0.0000e+00 0.00001 0.00000 (sdev) + 2 488276 Sep 17 2021 5.0755 5.0691 33.2387 33.2423 5.6803 5.6778 26.2002 26.2033 21827 909.417 99.550 5.6883 3.257440 5.6858 3.257537 52.24 1.0039e-01 1.9333 1.9181 2.6738 5.3076e-02 7.880 3.9156e-04 1.2454e-01 44.26736 -63.31802 (avg) + 03:53:41 14 0.595 0.087 0.0009 0.000153 0.0069 0.000574 0.13 0.0000e+00 0.0006 0.0005 0.0156 1.3317e-02 0.000 5.4324e-05 0.0000e+00 0.00000 0.00000 (sdev) + 3 488277 Sep 17 2021 5.3913 5.4081 32.9032 32.9035 4.6559 4.6443 26.0508 26.0523 24106 1004.375 79.923 4.6616 3.138637 4.6500 3.137670 72.04 1.0039e-01 1.9841 1.9672 2.7567 6.2047e-02 7.864 3.3767e-04 1.2454e-01 44.26739 -63.31814 (avg) + 03:55:16 14 0.595 0.043 0.0036 0.000278 0.0053 0.000398 0.07 0.0000e+00 0.0005 0.0008 0.0272 7.8169e-03 0.000 4.4882e-05 0.0000e+00 0.00001 0.00000 (sdev) + 4 488278 Sep 17 2021 5.7698 5.7694 32.6090 32.6111 4.4102 4.4091 25.8432 25.8450 25970 1082.042 60.305 4.4144 3.091459 4.4133 3.091541 92.03 1.0039e-01 2.0769 2.0589 2.7874 9.1949e-02 7.879 2.9210e-04 1.2454e-01 44.26744 -63.31828 (avg) + 03:56:33 14 0.595 0.049 0.0023 0.000140 0.0023 0.000148 0.17 0.0000e+00 0.0005 0.0002 0.0141 9.6856e-03 0.000 6.1380e-06 0.0000e+00 0.00000 0.00000 (sdev) + 5 488279 Sep 17 2021 6.0206 6.0367 32.4310 32.4342 4.6414 4.6477 25.6778 25.6796 27678 1153.208 49.913 4.6449 3.095198 4.6512 3.096004 99.85 1.0039e-01 2.1551 2.1376 2.8394 1.7219e-01 7.902 2.9783e-04 1.2454e-01 44.26750 -63.31842 (avg) + 03:57:45 14 0.595 0.056 0.0008 0.000077 0.0028 0.000162 0.00 0.0000e+00 0.0005 0.0006 0.0180 1.3246e-02 0.000 2.0868e-05 0.0000e+00 0.00000 0.00000 (sdev) + 6 488280 Sep 17 2021 6.3072 6.3435 32.3181 32.3333 5.6782 5.7907 25.4725 25.4712 29213 1217.167 39.880 5.6813 3.172728 5.7938 3.183652 84.00 1.0039e-01 2.2814 2.2714 2.8621 3.7502e-01 7.951 2.4341e-04 1.2454e-01 44.26752 -63.31854 (avg) + 03:58:49 14 0.595 0.064 0.0377 0.002520 0.0327 0.003665 0.26 0.0000e+00 0.0004 0.0003 0.0185 1.9625e-02 0.000 3.3274e-06 0.0000e+00 0.00000 0.00000 (sdev) + 7 488281 Sep 17 2021 6.7603 6.7842 32.0851 32.0996 8.7174 8.7422 24.8799 24.8875 30896 1287.292 30.241 8.7205 3.412039 8.7453 3.415584 66.55 1.0039e-01 2.5552 2.5399 2.8983 2.4445e+00 8.035 3.2280e-04 1.2454e-01 44.26758 -63.31868 (avg) + 03:59:59 14 0.595 0.051 0.0255 0.003327 0.0049 0.000342 0.41 0.0000e+00 0.0014 0.0004 0.0179 7.8550e-02 0.000 7.1470e-06 0.0000e+00 0.00000 0.00000 (sdev) + 8 488282 Sep 17 2021 6.0264 6.0183 31.1459 31.1437 15.9320 15.9964 22.8012 22.7852 32452 1352.125 19.796 15.9350 3.949537 15.9994 3.955038 50.57 1.0039e-01 2.6323 2.6101 2.3874 1.2626e+00 8.115 2.9396e-04 1.2454e-01 44.26764 -63.31880 (avg) + 04:01:03 14 0.595 0.113 0.0398 0.002443 0.0365 0.001873 0.42 0.0000e+00 0.0034 0.0018 0.0185 6.3196e-02 0.000 1.1737e-06 0.0000e+00 0.00000 0.00000 (sdev) + 9 488283 Sep 17 2021 5.5867 5.6037 30.9038 30.9052 18.4210 18.4651 22.0370 22.0274 34129 1422.000 10.032 18.4227 4.144277 18.4669 4.148441 33.49 1.0039e-01 2.5785 2.5570 2.1243 9.1425e-01 8.174 2.4044e-04 1.2454e-01 44.26764 -63.31886 (avg) + 04:02:13 14 0.595 0.052 0.0032 0.000211 0.0044 0.000253 0.23 0.0000e+00 0.0030 0.0011 0.0179 4.1454e-02 0.000 6.3239e-06 0.0000e+00 0.00000 0.00000 (sdev) + 10 488284 Sep 17 2021 5.6037 5.6054 30.8985 30.9007 18.5010 18.5023 22.0135 22.0149 37066 1544.375 2.806 18.5015 4.150469 18.5028 4.150851 99.85 1.2766e-01 2.5834 2.5645 2.0742 8.1981e-01 8.202 2.3450e-04 1.2454e-01 44.26768 -63.31892 (avg) + 04:04:16 14 0.595 0.082 0.0004 0.000052 0.0012 0.000096 0.00 3.3264e-02 0.0020 0.0000 0.0212 4.1331e-02 0.000 5.7686e-06 0.0000e+00 0.00000 0.00000 (sdev) diff --git a/tests/test_read.py b/tests/test_read.py index fab8f83..d05dbc2 100644 --- a/tests/test_read.py +++ b/tests/test_read.py @@ -53,6 +53,11 @@ def btl(): yield ctd.from_btl(data_path.joinpath("btl", "bottletest.btl")) +@pytest.fixture +def btl(): + yield ctd.from_btl(data_path.joinpath("btl", "alt_bottletest.btl")) + + @pytest.fixture def ros(): yield ctd.rosette_summary(data_path.joinpath("CTD", "g01l03s01m-m2.ros")) From 0e4b3cf8eb5bfe6e862052b0339e7744e3f6fb06 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 12:16:39 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ctd/read.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctd/read.py b/ctd/read.py index 442e22a..61b4027 100644 --- a/ctd/read.py +++ b/ctd/read.py @@ -246,7 +246,7 @@ def from_btl(fname): # Get row types, see what you have: avg, std, min, max or just avg, std. rowtypes = df[df.columns[-1]].unique() # Get times and dates which occur on second line of each bottle. - date_idx = metadata['names'].index('Date') + date_idx = metadata["names"].index("Date") dates = df.iloc[:: len(rowtypes), date_idx].reset_index(drop=True) times = df.iloc[1 :: len(rowtypes), date_idx].reset_index(drop=True) datetimes = dates + " " + times From 81d76c9e652a8ddb272e9897caecb6d5b74c44d3 Mon Sep 17 00:00:00 2001 From: Filipe Date: Wed, 11 May 2022 15:50:21 -0300 Subject: [PATCH 3/6] Extension of all upper case --- tests/test_read.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_read.py b/tests/test_read.py index d05dbc2..aeda23e 100644 --- a/tests/test_read.py +++ b/tests/test_read.py @@ -55,7 +55,7 @@ def btl(): @pytest.fixture def btl(): - yield ctd.from_btl(data_path.joinpath("btl", "alt_bottletest.btl")) + yield ctd.from_btl(data_path.joinpath("btl", "alt_bottletest.BTL")) @pytest.fixture From edd35543c3d70bfec278ec20aa7b5cae20cb008c Mon Sep 17 00:00:00 2001 From: Patrick Upson Date: Wed, 11 May 2022 17:27:04 -0300 Subject: [PATCH 4/6] Fix spelling and renamed duplicate btl test function definition --- ctd/read.py | 2 +- tests/test_read.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctd/read.py b/ctd/read.py index 61b4027..ac277e4 100644 --- a/ctd/read.py +++ b/ctd/read.py @@ -91,7 +91,7 @@ def _remane_duplicate_columns(names): dup.append(item) # since we can assume there are only two instances of a word in the list, how about we find the last - # index of an instance, which will be the second occurence of the item + # index of an instance, which will be the second occurrence of the item second_occurrences = [len(names) - names[::-1].index(item) - 1 for item in dup] for idx in second_occurrences: names[idx] = f"{names[idx]}_" diff --git a/tests/test_read.py b/tests/test_read.py index aeda23e..0c5ab7f 100644 --- a/tests/test_read.py +++ b/tests/test_read.py @@ -54,7 +54,7 @@ def btl(): @pytest.fixture -def btl(): +def btl_duplicate_header_name(): yield ctd.from_btl(data_path.joinpath("btl", "alt_bottletest.BTL")) From d738858c33b6e2a8da9fd336e706c2b4891517de Mon Sep 17 00:00:00 2001 From: Patrick Upson Date: Tue, 17 May 2022 12:38:09 -0300 Subject: [PATCH 5/6] removed __pycache__ dir and updated gitignore --- .../test_plotting.cpython-38-pytest-7.1.2.pyc | Bin 2781 -> 0 bytes tests/__pycache__/test_plotting.cpython-38.pyc | Bin 1986 -> 0 bytes .../test_processing.cpython-38-pytest-7.1.2.pyc | Bin 10579 -> 0 bytes ...essing_real_data.cpython-38-pytest-7.1.2.pyc | Bin 3539 -> 0 bytes .../test_read.cpython-38-pytest-7.1.2.pyc | Bin 6499 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/__pycache__/test_plotting.cpython-38-pytest-7.1.2.pyc delete mode 100644 tests/__pycache__/test_plotting.cpython-38.pyc delete mode 100644 tests/__pycache__/test_processing.cpython-38-pytest-7.1.2.pyc delete mode 100644 tests/__pycache__/test_processing_real_data.cpython-38-pytest-7.1.2.pyc delete mode 100644 tests/__pycache__/test_read.cpython-38-pytest-7.1.2.pyc diff --git a/tests/__pycache__/test_plotting.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_plotting.cpython-38-pytest-7.1.2.pyc deleted file mode 100644 index 4ab017441a855f24b5334d0d0d2e69dc15eca12b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2781 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 diff --git a/tests/__pycache__/test_processing.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_processing.cpython-38-pytest-7.1.2.pyc deleted file mode 100644 index 856c01c9c8036f5655f2505cd6943d052a2d3ef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10579 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 diff --git a/tests/__pycache__/test_processing_real_data.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_processing_real_data.cpython-38-pytest-7.1.2.pyc deleted file mode 100644 index de5eeaf97e84b2f1c0260090a5b871666b99ff61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3539 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 diff --git a/tests/__pycache__/test_read.cpython-38-pytest-7.1.2.pyc b/tests/__pycache__/test_read.cpython-38-pytest-7.1.2.pyc deleted file mode 100644 index 7164b898769b964097c27f0adf61c4c5e500814e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6499 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 Date: Wed, 18 May 2022 11:06:49 -0300 Subject: [PATCH 6/6] add a test --- tests/test_read.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/test_read.py b/tests/test_read.py index 0c5ab7f..ca98459 100644 --- a/tests/test_read.py +++ b/tests/test_read.py @@ -83,6 +83,12 @@ def test_btl_is_dataframe(btl): assert not btl.empty +def test_btl_with_dup_cols(btl_duplicate_header_name): + assert all( + col in btl_duplicate_header_name.columns for col in ["Bottle", "Bottle_"] + ) + + def test_ros_is_dataframe(ros): assert isinstance(ros, pd.DataFrame) assert not ros.empty