Further code cleanups

stonerlab · Jan 2, 2024 · b5a833d · b5a833d
1 parent ee19dbb
commit b5a833d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 455 deletions.
diff --git a/.github/workflows/run-tests-action.yaml b/.github/workflows/run-tests-action.yaml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
+      - name: Fix git config
+        run: git config --global --add safe.directory /github/workspace
       - name: Install Conda environment with Micromamba
         uses: mamba-org/provision-with-micromamba@main
         with:

diff --git a/Stoner/core/base.py b/Stoner/core/base.py
@@ -306,7 +306,7 @@ class typeHintedDict(regexpDict):
     __regexTimestamp: RegExp = re.compile(r"Timestamp")
     __regexEvaluatable: RegExp = re.compile(r"^(Cluster||\d+D Array|List)")
 
-    __types: Dict[str, type] = dict(
+    __types: Dict[str, type] = dict(  # pylint: disable=use-before-assignment
         [  # Key order does matter here!
             ("Boolean", bool),
             ("I32", int),

diff --git a/Stoner/formats/generic.py b/Stoner/formats/generic.py
@@ -460,7 +460,7 @@ def load_tdms(new_data, filename=None, *args, **kargs):
                     new_data.column_headers = tmp.column_headers
                     new_data.metadata.update(grp.properties)
                 else:
-                    tmp = DataFile(grp.as_dataframe())
+                    tmp = make_Data(grp.as_dataframe())
                     new_data.data = tmp.data
                     new_data.column_headers = tmp.column_headers
         except (IOError, ValueError, TypeError, StonerLoadError) as err:

diff --git a/Stoner/plot/__init__.py b/Stoner/plot/__init__.py
@@ -7,7 +7,6 @@
 :py:mod:`Stoner.plot.util` module provides
 some handy utility functions.
 """
-
-from .core import PlotMixin
-
 __all__ = ["PlotMixin", "formats", "utils"]
+from .core import PlotMixin
+from . import formats, utils