Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config/toggle validation #164

Merged
merged 2 commits into from
Aug 6, 2014
Merged

Config/toggle validation #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a18e64f
toggle the validation
wkerzendorf Aug 6, 2014
ad850db
added documnetation
wkerzendorf Aug 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion astropy_helpers
Open in desktop
Submodule astropy_helpers updated 27 files
+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
11 changes: 8 additions & 3 deletions tardis/io/config_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
-------
Expand All @@ -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:
Expand Down