Put down some medium severity issues

Author: gb119

Stoner/Zip.py

@@ -18,6 +18,7 @@
 from .folders.core import baseFolder
 from .folders.utils import pathjoin
 from .tools import copy_into, make_Data
+from .tools.file import get_filename
 
 
 def test_is_zip(filename, member=""):
@@ -120,8 +121,8 @@ def _extract(self, archive, member):
         self.filename = path.join(archive.filename, member)
         return self
 
-    def _load(self, filename=None, *args, **kargs):
-        """Load a file from the zip file, opening it as necessary."""
+    def _load(self, *args, **kargs):
+        filename, args, kargs = get_filename(args, kargs)
         if filename is None or not filename:
             self.get_filename("r")
         else:

Stoner/analysis/fitting/mixins.py

@@ -333,7 +333,7 @@ def _get_model_parnames(model):
         raise ValueError(
             "".join(
                 [
-                    f"Unrecognised type for model! - should be lmfit.Model, scipy.odr.Model",
+                    "Unrecognised type for model! - should be lmfit.Model, scipy.odr.Model",
                     f" or callable, not {type(model)}",
                 ]
             )

Stoner/formats/data/__init__.py

@@ -3,6 +3,6 @@
 This sub-package is lazy-loaded but then pulls in all of the modules in order to register the routines.
 """
 
-__all__ = ["generic", "hdf5", "instruments", "facilities", "rigs", "simulations", "attocube", "maximus", "zip"]
+__all__ = ["generic", "hdf5", "instruments", "facilities", "rigs", "simulations", "attocube", "maximus", "zipped"]
 
-from . import generic, hdf5, instruments, facilities, rigs, simulations, attocube, maximus, zip
+from . import generic, hdf5, instruments, facilities, rigs, simulations, attocube, maximus, zip as zipped

Stoner/formats/maximus.py

@@ -20,7 +20,6 @@
 from ..compat import string_types
 from ..HDF5 import HDFFileManager
 from ..tools.file import FileManager, get_filename
-from ..core.exceptions import StonerLoadError
 
 SCAN_NO = re.compile(r"MPI_(\d+)")
 

Stoner/plot/formats.py

@@ -226,7 +226,7 @@ def __init__(self, *args, **kargs):
         # self.fig_width = None
         # self.fig_height = None
 
-        self.update(**kargs)
+        self.update(kargs)
 
     def __call__(self, **kargs):
         """Call the template object can manipulate the rcParams that will be set."""
@@ -376,25 +376,25 @@ def clear(self):
         for attr in attrs:
             delattr(self, attr)
 
-    def update(self, *args, **kargs):  # pylint: disable=signature-differs
+    def update(self, other):
         """Update the template with new attributes from keyword arguments.
 
         Up to one positional argument may be supplied
 
         Keyword arguments may be supplied to set default parameters. Any Matplotlib rc parameter
         may be specified, with .'s replaced with _ and )_ replaced with __.
         """
-        if len(args) == 1 and isinstance(args[0], Mapping):
-            super().update(args[0])
-        elif len(args) > 0:
-            raise SyntaxError(
-                "Only one posotional argument which should be a Mapping subclass can be supplied toi update."
-            )
-        for k in kargs:
-            if k in dir(self) and not callable(self.__getattr__(k)):
-                self.__setattr__(k, kargs[k])
-            elif not k.startswith("_"):
-                self.__setattr__("template_" + k, kargs[k])
+        match other:
+            case Mapping():
+                for k, val in other.items():
+                    if k in dir(self) and not callable(self.__getattr__(k)):
+                        self.__setattr__(k, val)
+                    elif not k.startswith("_"):
+                        self.__setattr__("template_" + k, val)
+            case _:
+                raise SyntaxError(
+                    "Only one posotional argument which should be a Mapping subclass can be supplied toi update."
+                )
 
     def new_figure(self, figure=False, **kargs):
         """Create a new figure.

Stoner/plot/utils.py

@@ -41,7 +41,7 @@
     "auto_fit_fontsize",
 ]
 import warnings
-from distutils.version import LooseVersion
+from looseversion import LooseVersion
 
 import numpy as np
 import matplotlib.pyplot as plt

Stoner/tools/file.py

@@ -110,7 +110,7 @@ def get_file_name_type(
     if isinstance(filetype, string_types):  # We can specify filetype as part of name
         try:
             filetype = regexpDict(subclasses(parent))[filetype]  # pylint: disable=E1136
-        except KeyError:
+        except KeyError as keyerr:
             parts = filetype.split(".")
             mod = ".".join(parts[:-1])
             try:
@@ -119,7 +119,7 @@ def get_file_name_type(
             except (ImportError, AttributeError) as err:
                 raise ValueError(f"Unable to import {filetype}") from err
             if not issubclass(filetype, parent):
-                raise ValueError(f"{filetype} is  not a subclass of DataFile.")
+                raise ValueError(f"{filetype} is  not a subclass of DataFile.") from keyerr
     if filename is None or (isinstance(filename, bool) and not filename):
         if filetype is None:
             filetype = parent

doc/requirements.txt

@@ -12,3 +12,4 @@ multiprocess
 asteval
 lmfit
 urllib3>=1.26
+looseversion>=1.0

recipe/meta.yaml

@@ -43,6 +43,7 @@ requirements:
     - dill >=0.2.8
     - urllib3 >=1.26
     - python-dateutil >=2.8
+    - looseversion >=1.0
 
 
 

requirements.txt

@@ -17,4 +17,5 @@ multiprocess>=0.70
 dill>=0.2.8
 urllib3>=1.26
 dateutil>=2.8
-seaborn>=0.13
+seaborn>=0.13
+looseversion>=1.0