Merge pull request #81 from vonopr/cnv_pressure

Author: ocefpaf

.pre-commit-config.yaml

@@ -14,11 +14,11 @@ repos:
       files: requirements-dev.txt
 
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.2
+  rev: 3.7.9
   hooks:
     - id: flake8
       exclude: docs/source/conf.py
-      args: [--max-line-length=105]
+      args: [--max-line-length=105, --ignore=E203,E501,W503, --select=select=C,E,F,W,B,B950]
 
 - repo: https://github.com/pre-commit/mirrors-isort
   rev: v4.3.21

ctd/read.py

@@ -5,6 +5,7 @@
 import re
 import warnings
 import zipfile
+
 from datetime import datetime
 from io import StringIO
 from pathlib import Path
@@ -88,7 +89,7 @@ def _remane_duplicate_columns(names):
     return names
 
 
-def _parse_seabird(lines, ftype="cnv"):
+def _parse_seabird(lines, ftype):
     # Initialize variables.
     lon = lat = time = None, None, None
     skiprows = 0
@@ -319,7 +320,7 @@ def from_edf(fname):
         else:
             header.append(line)
             if line.startswith("Field"):
-                col, unit = [l.strip().casefold() for l in line.split(":")]
+                col, unit = [ln.strip().casefold() for ln in line.split(":")]
                 names.append(unit.split()[0])
         if line == "// Data":
             skiprows = k + 1
@@ -381,17 +382,15 @@ def from_cnv(fname):
     f.close()
 
     key_set = False
-    prkeys = ["prDM", "prdM", "pr"]
+    prkeys = ["prM ", "prE", "prDM", "pr50M", "pr50M1", "prSM", "prdM", "pr"]
     for prkey in prkeys:
         try:
             df.set_index(prkey, drop=True, inplace=True)
             key_set = True
         except KeyError:
             continue
     if not key_set:
-        raise KeyError(
-            f"Could not find pressure field (supported names are {prkeys})."
-        )
+        raise KeyError(f"Could not find pressure field (supported names are {prkeys}).")
     df.index.name = "Pressure [dbar]"
 
     name = _basename(fname)[1]

setup.cfg

@@ -46,3 +46,8 @@ ignore =
     notebooks/*
     tests
     tests/*
+
+[flake8]
+max-line-length = 105
+select = C,E,F,W,B,B950
+ignore = E203, E501, W503