Merge branch 'master' into JhonFlash-master

.github/workflows/ci.yml

@@ -17,8 +17,7 @@ jobs:
 
   pytest:
     name: Run Python unit tests
-    # Note that 20.04 is currently required until galvani supports mdbtools>=1.0.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

galvani/BioLogic.py

@@ -269,6 +269,7 @@ VMPdata_colID_dtype_map = {
     23: ("dQ/mA.h", "<f8"),  # Same as 7?
     24: ("cycle number", "<f8"),
     26: ("Rapp/Ohm", "<f4"),
+    27: ("Ewe-Ece/V", "<f4"),
     32: ("freq/Hz", "<f4"),
     33: ("|Ewe|/V", "<f4"),
     34: ("|I|/A", "<f4"),

galvani/res2sqlite.py

@@ -439,7 +439,8 @@ CREATE VIEW IF NOT EXISTS Capacity_View
 def mdb_get_data_text(s3db, filename, table):
     print("Reading %s..." % table)
     insert_pattern = re.compile(
-        r'INSERT INTO "\w+" \([^)]+?\) VALUES \(("[^"]*"|[^")])+?\);\n', re.IGNORECASE
+        r"""INSERT INTO "\w+" \([^)]+?\) VALUES (\((('[^']*')|"[^"]*"|[^')])+?\),?\s*)+;\n""",
+        re.IGNORECASE,
     )
     try:
         # Initialize values to avoid NameError in except clause

setup.py

@@ -12,7 +12,7 @@ with open(os.path.join(os.path.dirname(__file__), "README.md")) as f:
 
 setup(
     name="galvani",
-    version="0.2.1",
+    version="0.3.0",
     description="Open and process battery charger log data files",
     long_description=readme,
     long_description_content_type="text/markdown",

tests/test_BioLogic.py

@@ -137,6 +137,7 @@ def test_parse_BioLogic_date(data, expected):
         ("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"),
+        ("col_27_issue_74.mpr", "2022-07-28", "2022-07-28"),
     ],
 )
 def test_MPR_dates(testdata_dir, filename, startdate, enddate):