Ianhelle/mpconfigedit fix from main 2022 05 22 (#396)

* Fix for MpConfigEdit ValueError

Updating version for hotfix

# Conflicts:
#	msticpy/_version.py

* MpConfig edit throws error with invalid file path.

* Updating Dockerfile source to mcr anaconda

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # See here for image contents: https://hub.docker.com/r/jupyter/scipy-notebook
-FROM jupyter/scipy-notebook
+FROM mcr.microsoft.com/vscode/devcontainers/anaconda
 LABEL maintainer="Msticpy Dev Team <[email protected]>"
 
 #installing Msticpy requirements and dependencies

msticpy/config/mp_config_edit.py

@@ -78,8 +78,7 @@ def __init__(
             if not self.mp_conf_file.current_file and conf_filepath:
                 self.mp_conf_file.current_file = conf_filepath
         elif isinstance(settings, str):
-            self.mp_conf_file = MpConfigFile()
-            self.mp_conf_file.load_from_file(file=settings)
+            self.mp_conf_file = MpConfigFile(file=settings)
         else:
             self.mp_conf_file = MpConfigFile()
             self.mp_conf_file.load_default()

msticpy/config/mp_config_file.py

@@ -8,7 +8,6 @@
 import io
 import os
 import pprint
-import warnings
 from contextlib import redirect_stdout, suppress
 from datetime import datetime
 from pathlib import Path
@@ -118,7 +117,7 @@ def __init__(
             self.mp_config_def_path is not None
             and not Path(self.mp_config_def_path).is_file()
         ):
-            warnings.warn(
+            self.set_status(
                 "MSTICPYCONFIG env variable is pointing to invalid path."
                 + self.mp_config_def_path
             )
@@ -137,7 +136,7 @@ def __init__(
         if self.current_file and Path(self.current_file).is_file():
             self.load_from_file(self.current_file)
         else:
-            raise ValueError(f"File not found: '{self.current_file}'.")
+            self.set_status(f"Filename does not exist: '{self.current_file}'.")
 
     @property
     def current_file(self):

prospector.yml

@@ -14,13 +14,13 @@ ignore-paths:
 pyroma:
   run: true
 
-pycodestyle:
+pep8:
   full: true
   disable: [
       E501, # Line length handled by Black
     ]
 
-pydocstyle:
+pep257:
   disable: [
       # Disable because not part of PEP257 official convention:
       # see http://pep257.readthedocs.io/en/latest/error_codes.html

tests/config/test_mp_config_edit.py

@@ -137,9 +137,10 @@ def test_mp_edit_load_params():
         for key in orig_settings.keys():
             check.equal(orig_settings[key], mp_conf.mp_controls.mp_config[key])
 
-    # Test no existing MPConfig
+    # Test invalid file in MPConfig env and with file parameter.
+    # should load without exception
     with custom_mp_config(str(config_path)):
         os.environ["MSTICPYCONFIG"] = "./invalid_file.yaml"
-        with pytest.raises(ValueError):
-            with pytest.warns(UserWarning):
-                mp_conf = MpConfigEdit()
+        mp_conf = MpConfigEdit()
+
+        mp_conf = MpConfigEdit(settings="./invalid_file.yaml")