From 4f8351a641f8066266991e733c81270ae96f085b Mon Sep 17 00:00:00 2001
From: Peter Kraus <peter@tondon.de>
Date: Sat, 6 Apr 2024 12:32:56 +0200
Subject: [PATCH] Other minor changes

---
 src/yadg/_version.py                                   | 2 +-
 src/yadg/core/__init__.py                              | 4 ++++
 src/yadg/dgutils/pintutils.py                          | 3 ++-
 src/yadg/parsers/chromdata/__init__.py                 | 1 +
 src/yadg/parsers/chromdata/empalccsv.py                | 1 +
 src/yadg/parsers/chromdata/empalcxlsx.py               | 1 +
 src/yadg/parsers/chromdata/fusioncsv.py                | 1 +
 src/yadg/parsers/chromdata/fusionjson.py               | 1 +
 src/yadg/parsers/chromdata/fusionzip.py                | 1 +
 src/yadg/parsers/chromtrace/agilentch.py               | 1 +
 src/yadg/parsers/chromtrace/agilentcsv.py              | 1 +
 src/yadg/parsers/chromtrace/agilentdx.py               | 1 +
 src/yadg/parsers/chromtrace/ezchromasc.py              | 1 +
 src/yadg/parsers/chromtrace/fusionjson.py              | 1 +
 src/yadg/parsers/chromtrace/fusionzip.py               | 1 +
 src/yadg/parsers/dummy/__init__.py                     | 1 +
 src/yadg/parsers/electrochem/__init__.py               | 1 +
 src/yadg/parsers/electrochem/eclabcommon/techniques.py | 1 +
 src/yadg/parsers/electrochem/eclabmpr.py               | 1 +
 src/yadg/parsers/electrochem/eclabmpt.py               | 1 +
 src/yadg/parsers/flowdata/__init__.py                  | 1 +
 src/yadg/parsers/flowdata/drycal.py                    | 1 +
 src/yadg/parsers/flowdata/main.py                      | 1 -
 src/yadg/parsers/masstrace/__init__.py                 | 1 +
 src/yadg/parsers/masstrace/quadstarsac.py              | 1 +
 src/yadg/parsers/qftrace/__init__.py                   | 1 +
 src/yadg/parsers/xpstrace/__init__.py                  | 1 +
 src/yadg/parsers/xrdtrace/__init__.py                  | 1 +
 src/yadg/subcommands.py                                | 4 ++++
 tests/test_basiccsv.py                                 | 3 +--
 versioneer.py                                          | 4 +---
 31 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/yadg/_version.py b/src/yadg/_version.py
index f80db0c0..5857c82d 100644
--- a/src/yadg/_version.py
+++ b/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:
diff --git a/src/yadg/core/__init__.py b/src/yadg/core/__init__.py
index 9af1cd31..c587cef6 100644
--- a/src/yadg/core/__init__.py
+++ b/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)
diff --git a/src/yadg/dgutils/pintutils.py b/src/yadg/dgutils/pintutils.py
index 99296fb2..5ab570cd 100644
--- a/src/yadg/dgutils/pintutils.py
+++ b/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.
diff --git a/src/yadg/parsers/chromdata/__init__.py b/src/yadg/parsers/chromdata/__init__.py
index 87406b6f..19f85f3a 100644
--- a/src/yadg/parsers/chromdata/__init__.py
+++ b/src/yadg/parsers/chromdata/__init__.py
@@ -54,6 +54,7 @@
 ````````````````
 
 """
+
 import xarray as xr
 
 from . import (
diff --git a/src/yadg/parsers/chromdata/empalccsv.py b/src/yadg/parsers/chromdata/empalccsv.py
index bc85cbb8..2a587931 100644
--- a/src/yadg/parsers/chromdata/empalccsv.py
+++ b/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
diff --git a/src/yadg/parsers/chromdata/empalcxlsx.py b/src/yadg/parsers/chromdata/empalcxlsx.py
index aaa05ced..fdd80855 100644
--- a/src/yadg/parsers/chromdata/empalcxlsx.py
+++ b/src/yadg/parsers/chromdata/empalcxlsx.py
@@ -12,6 +12,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import logging
 import datetime
 import openpyxl
diff --git a/src/yadg/parsers/chromdata/fusioncsv.py b/src/yadg/parsers/chromdata/fusioncsv.py
index 047a149a..e75f3524 100644
--- a/src/yadg/parsers/chromdata/fusioncsv.py
+++ b/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
diff --git a/src/yadg/parsers/chromdata/fusionjson.py b/src/yadg/parsers/chromdata/fusionjson.py
index b085e36b..8eb58b76 100644
--- a/src/yadg/parsers/chromdata/fusionjson.py
+++ b/src/yadg/parsers/chromdata/fusionjson.py
@@ -30,6 +30,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import json
 import logging
 from zoneinfo import ZoneInfo
diff --git a/src/yadg/parsers/chromdata/fusionzip.py b/src/yadg/parsers/chromdata/fusionzip.py
index 8740c9fa..9755f5f5 100644
--- a/src/yadg/parsers/chromdata/fusionzip.py
+++ b/src/yadg/parsers/chromdata/fusionzip.py
@@ -8,6 +8,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import zipfile
 import tempfile
 import os
diff --git a/src/yadg/parsers/chromtrace/agilentch.py b/src/yadg/parsers/chromtrace/agilentch.py
index 180738e7..0d7aea2f 100644
--- a/src/yadg/parsers/chromtrace/agilentch.py
+++ b/src/yadg/parsers/chromtrace/agilentch.py
@@ -33,6 +33,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import numpy as np
 from zoneinfo import ZoneInfo
 from ... import dgutils
diff --git a/src/yadg/parsers/chromtrace/agilentcsv.py b/src/yadg/parsers/chromtrace/agilentcsv.py
index 6e814fc1..60683869 100644
--- a/src/yadg/parsers/chromtrace/agilentcsv.py
+++ b/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
diff --git a/src/yadg/parsers/chromtrace/agilentdx.py b/src/yadg/parsers/chromtrace/agilentdx.py
index f3c90f48..f38dbc31 100644
--- a/src/yadg/parsers/chromtrace/agilentdx.py
+++ b/src/yadg/parsers/chromtrace/agilentdx.py
@@ -17,6 +17,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import zipfile
 import tempfile
 import os
diff --git a/src/yadg/parsers/chromtrace/ezchromasc.py b/src/yadg/parsers/chromtrace/ezchromasc.py
index 801d1bc9..7f09057e 100644
--- a/src/yadg/parsers/chromtrace/ezchromasc.py
+++ b/src/yadg/parsers/chromtrace/ezchromasc.py
@@ -9,6 +9,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import numpy as np
 import logging
 from zoneinfo import ZoneInfo
diff --git a/src/yadg/parsers/chromtrace/fusionjson.py b/src/yadg/parsers/chromtrace/fusionjson.py
index ce6c8428..b3c24d31 100644
--- a/src/yadg/parsers/chromtrace/fusionjson.py
+++ b/src/yadg/parsers/chromtrace/fusionjson.py
@@ -18,6 +18,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import json
 from zoneinfo import ZoneInfo
 import numpy as np
diff --git a/src/yadg/parsers/chromtrace/fusionzip.py b/src/yadg/parsers/chromtrace/fusionzip.py
index fa704503..5087f227 100644
--- a/src/yadg/parsers/chromtrace/fusionzip.py
+++ b/src/yadg/parsers/chromtrace/fusionzip.py
@@ -18,6 +18,7 @@
 
 .. codeauthor:: Peter Kraus
 """
+
 import zipfile
 import tempfile
 import os
diff --git a/src/yadg/parsers/dummy/__init__.py b/src/yadg/parsers/dummy/__init__.py
index 1148dd28..d16f5f9d 100644
--- a/src/yadg/parsers/dummy/__init__.py
+++ b/src/yadg/parsers/dummy/__init__.py
@@ -32,6 +32,7 @@
 ````````````````
 
 """
+
 from pydantic import BaseModel
 import json
 from ... import dgutils
diff --git a/src/yadg/parsers/electrochem/__init__.py b/src/yadg/parsers/electrochem/__init__.py
index ac4208e9..c08f4e27 100644
--- a/src/yadg/parsers/electrochem/__init__.py
+++ b/src/yadg/parsers/electrochem/__init__.py
@@ -56,6 +56,7 @@
 ````````````````
 
 """
+
 import xarray as xr
 from . import eclabmpr, eclabmpt, tomatojson
 
diff --git a/src/yadg/parsers/electrochem/eclabcommon/techniques.py b/src/yadg/parsers/electrochem/eclabcommon/techniques.py
index 04ad9cb6..5c674530 100644
--- a/src/yadg/parsers/electrochem/eclabcommon/techniques.py
+++ b/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
diff --git a/src/yadg/parsers/electrochem/eclabmpr.py b/src/yadg/parsers/electrochem/eclabmpr.py
index f86c0a40..696470b7 100644
--- a/src/yadg/parsers/electrochem/eclabmpr.py
+++ b/src/yadg/parsers/electrochem/eclabmpr.py
@@ -194,6 +194,7 @@
 
 .. codeauthor:: Nicolas Vetsch
 """
+
 import logging
 from zoneinfo import ZoneInfo
 import xarray as xr
diff --git a/src/yadg/parsers/electrochem/eclabmpt.py b/src/yadg/parsers/electrochem/eclabmpt.py
index 7c6ac7da..3eba9cc6 100644
--- a/src/yadg/parsers/electrochem/eclabmpt.py
+++ b/src/yadg/parsers/electrochem/eclabmpt.py
@@ -31,6 +31,7 @@
 
 .. codeauthor:: Nicolas Vetsch
 """
+
 import re
 import logging
 import locale as lc
diff --git a/src/yadg/parsers/flowdata/__init__.py b/src/yadg/parsers/flowdata/__init__.py
index aa900f09..4b9e9431 100644
--- a/src/yadg/parsers/flowdata/__init__.py
+++ b/src/yadg/parsers/flowdata/__init__.py
@@ -33,6 +33,7 @@
 ````````````````
 
 """
+
 from .main import process
 
 __all__ = ["process"]
diff --git a/src/yadg/parsers/flowdata/drycal.py b/src/yadg/parsers/flowdata/drycal.py
index 0101b7b8..588952c3 100644
--- a/src/yadg/parsers/flowdata/drycal.py
+++ b/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
diff --git a/src/yadg/parsers/flowdata/main.py b/src/yadg/parsers/flowdata/main.py
index 15952259..95372eb6 100644
--- a/src/yadg/parsers/flowdata/main.py
+++ b/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"):
diff --git a/src/yadg/parsers/masstrace/__init__.py b/src/yadg/parsers/masstrace/__init__.py
index 0d4f5e35..cd4556ce 100644
--- a/src/yadg/parsers/masstrace/__init__.py
+++ b/src/yadg/parsers/masstrace/__init__.py
@@ -62,6 +62,7 @@
 ````````````````
 
 """
+
 import datatree
 from . import quadstarsac
 
diff --git a/src/yadg/parsers/masstrace/quadstarsac.py b/src/yadg/parsers/masstrace/quadstarsac.py
index 31db731b..774deedd 100644
--- a/src/yadg/parsers/masstrace/quadstarsac.py
+++ b/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
diff --git a/src/yadg/parsers/qftrace/__init__.py b/src/yadg/parsers/qftrace/__init__.py
index 1827f8eb..30111e9a 100644
--- a/src/yadg/parsers/qftrace/__init__.py
+++ b/src/yadg/parsers/qftrace/__init__.py
@@ -43,6 +43,7 @@
 ````````````````
 
 """
+
 from . import labviewcsv
 import datatree
 
diff --git a/src/yadg/parsers/xpstrace/__init__.py b/src/yadg/parsers/xpstrace/__init__.py
index 0a7638ba..93582b0f 100644
--- a/src/yadg/parsers/xpstrace/__init__.py
+++ b/src/yadg/parsers/xpstrace/__init__.py
@@ -40,6 +40,7 @@
 ````````````````
 
 """
+
 import datatree
 from . import phispe
 
diff --git a/src/yadg/parsers/xrdtrace/__init__.py b/src/yadg/parsers/xrdtrace/__init__.py
index 006d9c7b..6b04f801 100644
--- a/src/yadg/parsers/xrdtrace/__init__.py
+++ b/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
 
diff --git a/src/yadg/subcommands.py b/src/yadg/subcommands.py
index be5996bf..4a42533c 100644
--- a/src/yadg/subcommands.py
+++ b/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)
diff --git a/tests/test_basiccsv.py b/tests/test_basiccsv.py
index 0748748a..73bf6894 100644
--- a/tests/test_basiccsv.py
+++ b/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"
diff --git a/versioneer.py b/versioneer.py
index 2ab8b414..4c732005 100644
--- a/versioneer.py
+++ b/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