Merge pull request #164 from wkerzendorf/config/toggle_validation

Config/toggle validation
tardis-sn · Aug 6, 2014 · b28ffbf · b28ffbf
2 parents f3a68bf + ad850db
commit b28ffbf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/astropy_helpers b/astropy_helpers
diff --git a/tardis/io/config_reader.py b/tardis/io/config_reader.py
@@ -736,7 +736,7 @@ def from_yaml(cls, fname, test_parser=False):
 
     @classmethod
     def from_config_dict(cls, config_dict, atom_data=None, test_parser=False,
-                         config_definition_file=None):
+                         config_definition_file=None, validate=True):
         """
         Validating and subsequently parsing a config file.
 
@@ -759,6 +759,9 @@ def from_config_dict(cls, config_dict, atom_data=None, test_parser=False,
             path to config definition file, if `None` will be set to the default
             in the `data` directory that ships with TARDIS
 
+        validate: ~bool
+            Turn validation on or off. 
+
 
         Returns
         -------
@@ -771,9 +774,11 @@ def from_config_dict(cls, config_dict, atom_data=None, test_parser=False,
             config_definition_file = default_config_definition_file
 
         config_definition = yaml.load(open(config_definition_file))
-
-        validated_config_dict = ConfigurationValidator(config_definition,
+        if validate:
+            validated_config_dict = ConfigurationValidator(config_definition,
                                        config_dict).get_config()
+        else:
+            validated_config_dict = config_dict
 
         #First let's see if we can find an atom_db anywhere:
         if test_parser:
+22 −0		CHANGES.rst
+30 −0		README.rst
+172 −10		ah_bootstrap.py
+56 −182		astropy_helpers/setup_helpers.py
+1 −0		astropy_helpers/sphinx/conf.py
+2 −8		astropy_helpers/sphinx/ext/__init__.py
+15 −4		astropy_helpers/sphinx/ext/comment_eater.py
+16 −11		astropy_helpers/sphinx/ext/compiler_unparse.py
+53 −30		astropy_helpers/sphinx/ext/docscrape.py
+73 −26		astropy_helpers/sphinx/ext/docscrape_sphinx.py
+44 −26		astropy_helpers/sphinx/ext/numpydoc.py
+7 −2		astropy_helpers/sphinx/ext/phantom_import.py
+3 −2		astropy_helpers/sphinx/ext/smart_resolver.py
+762 −0		astropy_helpers/sphinx/ext/tests/test_docscrape.py
+8 −6		astropy_helpers/sphinx/ext/traitsdoc.py
+7 −0		astropy_helpers/sphinx/local/python3links.inv
+13 −0		astropy_helpers/sphinx/local/python3links.txt
+1 −0		astropy_helpers/sphinx/setup_package.py
+2 −0		astropy_helpers/sphinx/themes/bootstrap-astropy/layout.html
+57 −0		astropy_helpers/sphinx/themes/bootstrap-astropy/static/copybutton.js
+1 −1		astropy_helpers/test_helpers.py
+19 −0		astropy_helpers/tests/__init__.py
+50 −0		astropy_helpers/tests/test_ah_bootstrap.py
+117 −0		astropy_helpers/tests/test_setup_helpers.py
+50 −0		licenses/LICENSE_COPYBUTTON.rst
+94 −0		licenses/LICENSE_NUMPYDOC.rst
+17 −5		setup.py