Other minor changes

src/yadg/_version.py

@@ -92,7 +92,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
                 env=env,
                 stdout=subprocess.PIPE,
                 stderr=(subprocess.PIPE if hide_stderr else None),
-                **popen_kwargs
+                **popen_kwargs,
             )
             break
         except OSError:

src/yadg/core/__init__.py

@@ -76,6 +76,10 @@ def process_schema(dataschema: DataSchema, strict_merge: bool = False) -> DataTr
 
     while hasattr(dataschema, "update"):
         dataschema = dataschema.update()
+        if hasattr(dataschema, "metadata"):
+            if hasattr(dataschema.metadata, "version"):
+                if dataschema.metadata.version == "5.0":
+                    break
 
     for si, step in enumerate(dataschema.steps):
         logger.info("Processing step %d:", si)

src/yadg/dgutils/pintutils.py

@@ -7,6 +7,7 @@
 quantities (smL/min, sccm), and other dimensionless "units" present in several
 file types.
 """
+
 import logging
 from typing import Union
 import pint
@@ -48,7 +49,7 @@ def _sanitize_helper(unit: str) -> str:
 
 
 def sanitize_units(
-    units: Union[str, dict[str, str], list[str]]
+    units: Union[str, dict[str, str], list[str]],
 ) -> Union[str, dict[str, str], list[str]]:
     """
     Unit sanitizer.

src/yadg/parsers/chromdata/__init__.py

@@ -54,6 +54,7 @@
 ````````````````
 
 """
+
 import xarray as xr
 
 from . import (

src/yadg/parsers/chromdata/empalccsv.py

@@ -11,6 +11,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import logging
 import datetime
 from uncertainties.core import str_to_number_with_uncert as tuple_fromstr

src/yadg/parsers/chromdata/empalcxlsx.py

@@ -12,6 +12,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import logging
 import datetime
 import openpyxl

src/yadg/parsers/chromdata/fusioncsv.py

@@ -13,6 +13,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import logging
 from zoneinfo import ZoneInfo
 from ...dgutils.dateutils import str_to_uts

src/yadg/parsers/chromdata/fusionjson.py

@@ -30,6 +30,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import json
 import logging
 from zoneinfo import ZoneInfo

src/yadg/parsers/chromdata/fusionzip.py

@@ -8,6 +8,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import zipfile
 import tempfile
 import os

src/yadg/parsers/chromtrace/agilentch.py

@@ -33,6 +33,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import numpy as np
 from zoneinfo import ZoneInfo
 from ... import dgutils

src/yadg/parsers/chromtrace/agilentcsv.py

@@ -19,6 +19,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import numpy as np
 from zoneinfo import ZoneInfo
 from uncertainties.core import str_to_number_with_uncert as tuple_fromstr

src/yadg/parsers/chromtrace/agilentdx.py

@@ -17,6 +17,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import zipfile
 import tempfile
 import os

src/yadg/parsers/chromtrace/ezchromasc.py

@@ -9,6 +9,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import numpy as np
 import logging
 from zoneinfo import ZoneInfo

src/yadg/parsers/chromtrace/fusionjson.py

@@ -18,6 +18,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import json
 from zoneinfo import ZoneInfo
 import numpy as np

src/yadg/parsers/chromtrace/fusionzip.py

@@ -18,6 +18,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import zipfile
 import tempfile
 import os

src/yadg/parsers/dummy/__init__.py

@@ -32,6 +32,7 @@
 ````````````````
 
 """
+
 from pydantic import BaseModel
 import json
 from ... import dgutils

src/yadg/parsers/electrochem/__init__.py

@@ -56,6 +56,7 @@
 ````````````````
 
 """
+
 import xarray as xr
 from . import eclabmpr, eclabmpt, tomatojson
 

src/yadg/parsers/electrochem/eclabcommon/techniques.py

@@ -21,6 +21,7 @@
 in :func:`get_resolution`.
 
 """
+
 import re
 import numpy as np
 from typing import Union

src/yadg/parsers/electrochem/eclabmpr.py

@@ -194,6 +194,7 @@
 
 .. codeauthor:: Nicolas Vetsch
 """
+
 import logging
 from zoneinfo import ZoneInfo
 import xarray as xr

src/yadg/parsers/electrochem/eclabmpt.py

@@ -31,6 +31,7 @@
 
 .. codeauthor:: Nicolas Vetsch
 """
+
 import re
 import logging
 import locale as lc

src/yadg/parsers/flowdata/__init__.py

@@ -33,6 +33,7 @@
 ````````````````
 
 """
+
 from .main import process
 
 __all__ = ["process"]

src/yadg/parsers/flowdata/drycal.py

@@ -11,6 +11,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 from striprtf.striprtf import rtf_to_text
 from ..basiccsv.main import process_row, append_dicts, dicts_to_dataset
 from ... import dgutils

src/yadg/parsers/flowdata/main.py

@@ -40,7 +40,6 @@ def process(
     """
 
     if filetype.startswith("drycal"):
-
         if filetype.endswith(".rtf") or fn.endswith("rtf"):
             vals = drycal.rtf(fn, encoding, timezone)
         elif filetype.endswith(".csv") or fn.endswith("csv"):

src/yadg/parsers/masstrace/__init__.py

@@ -62,6 +62,7 @@
 ````````````````
 
 """
+
 import datatree
 from . import quadstarsac
 

src/yadg/parsers/masstrace/quadstarsac.py

@@ -64,6 +64,7 @@
 
 .. codeauthor:: Nicolas Vetsch
 """
+
 import numpy as np
 from datatree import DataTree
 import xarray as xr

src/yadg/parsers/qftrace/__init__.py

@@ -43,6 +43,7 @@
 ````````````````
 
 """
+
 from . import labviewcsv
 import datatree
 

src/yadg/parsers/xpstrace/__init__.py

@@ -40,6 +40,7 @@
 ````````````````
 
 """
+
 import datatree
 from . import phispe
 

src/yadg/parsers/xrdtrace/__init__.py

@@ -40,6 +40,7 @@
       intensity:   (uts, angle)       # Detector intensity (counts)
 
 """
+
 import xarray as xr
 from . import panalyticalxrdml, panalyticalcsv, panalyticalxy
 

src/yadg/subcommands.py

@@ -67,6 +67,10 @@ def process(args: argparse.Namespace) -> None:
 
     while hasattr(ds, "update"):
         ds = ds.update()
+        if hasattr(ds, "metadata"):
+            if hasattr(ds.metadata, "version"):
+                if ds.metadata.version == "5.0":
+                    break
 
     logger.debug("Processing schema")
     datagram = core.process_schema(ds, strict_merge=not args.ignore_merge_errors)

tests/test_basiccsv.py

@@ -271,7 +271,6 @@
                     },
                 },
             },
-
         ),
     ],
 )
@@ -300,4 +299,4 @@ def test_issue_143(datadir):
     ver = input.pop("version", "4.0")
     ret = datagram_from_input(input, "basiccsv", datadir, version=ver)
     print(f"{ret=}")
-    assert ret['0']['DryCal smL_min'].attrs["units"] == "smL/min"
+    assert ret["0"]["DryCal smL_min"].attrs["units"] == "smL/min"

versioneer.py

@@ -431,9 +431,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
     return stdout, process.returncode
 
 
-LONG_VERSION_PY[
-    "git"
-] = r'''
+LONG_VERSION_PY["git"] = r'''
 # This file helps to compute a version number in source trees obtained from
 # git-archive tarball (such as those provided by githubs download-from-tag
 # feature). Distribution tarballs (built by setup.py sdist) and build