Suggested changes

openscm · Aug 9, 2019 · 128a5b8 · 128a5b8
1 parent 0d8b881
commit 128a5b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pymagicc/core.py b/pymagicc/core.py
@@ -97,7 +97,8 @@ def __init__(self, root_dir=None, strict=True):
         strict: bool
             If True, enforce the configuration checks, otherwise a warning
             is raised if any invalid configuration is found and the run is
-            continued.
+            continued. Setting ``strict=False`` is only recommended for
+            experienced users of MAGICC.
         """
         self.root_dir = root_dir
         self.config = None
@@ -439,8 +440,8 @@ def check_config(self):
         emisscen_error_msg = (
             "You have more than one `FILE_EMISSCEN_X` flag set. Using more than "
             "one emissions scenario is hard to debug and unnecessary with "
-            "Pymagicc's dataframe scenario input. Please combine all your "
-            "scenarios into one dataframe with Pymagicc and pandas, then feed "
+            "Pymagicc's Dataframe scenario input. Please combine all your "
+            "scenarios into one Dataframe with Pymagicc and Pandas, then feed "
             "this single Dataframe into Pymagicc's run API."
         )
 

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -148,8 +148,8 @@ def test_run_failure_confusing_emissions_scenarios(package, invalid_config):
     error_msg = re.escape(
         "You have more than one `FILE_EMISSCEN_X` flag set. Using more than one "
         "emissions scenario is hard to debug and unnecessary with Pymagicc's "
-        "dataframe scenario input. Please combine all your scenarios into one "
-        "dataframe with Pymagicc and pandas, then feed this single Dataframe into "
+        "Dataframe scenario input. Please combine all your scenarios into one "
+        "Dataframe with Pymagicc and Pandas, then feed this single Dataframe into "
         "Pymagicc's run API."
     )
     with pytest.raises(ValueError, match=error_msg):
@@ -184,8 +184,8 @@ def test_check_config_non_strict(package_non_strict, invalid_config):
     error_msg = re.escape(
         "You have more than one `FILE_EMISSCEN_X` flag set. Using more than one "
         "emissions scenario is hard to debug and unnecessary with Pymagicc's "
-        "dataframe scenario input. Please combine all your scenarios into one "
-        "dataframe with Pymagicc and pandas, then feed this single Dataframe into "
+        "Dataframe scenario input. Please combine all your scenarios into one "
+        "Dataframe with Pymagicc and Pandas, then feed this single Dataframe into "
         "Pymagicc's run API."
     )
     with pytest.warns(UserWarning, match=error_msg):