branch to help with pr review #672
Conversation
| if schema is not None: | ||
| # not checking schema on external components yet | ||
| cimeroot = get_cime_root() | ||
| if cimeroot in os.path.abspath(infile): |
There was a problem hiding this comment.
This only applies to xml files within cime for now, when the component models catch up we can apply to them as well.
| @@ -43,11 +40,12 @@ def get_valid_model_components(self): | |||
| components = comps.split(',') | |||
| return components | |||
|
|
|||
| def _get_value_match(self, node, attributes=None): | |||
| def _get_value_match(self, node, attributes=None, exact_match=False): | |||
There was a problem hiding this comment.
Matching for components and compsets is regex matching, while matching for namelists is exact.
| return default.text | ||
| else: | ||
| return None | ||
| def _get_node_element_info(self, node, element_name): |
There was a problem hiding this comment.
General method to get text from a child element of node
| @@ -125,7 +125,8 @@ def get_nodes(self, nodename, attributes=None, root=None, xpath=None): | |||
|
|
|||
| for key, value in attributes.iteritems(): | |||
| if value is not None: | |||
| expect(isinstance(value, str), " Bad value passed for key %s"%key) | |||
| expect(isinstance(value, str) or isinstance(value, unicode), | |||
There was a problem hiding this comment.
I've since learned that this can be written isinstance(value, basestring), I will change this.
| """Interface to `namelist_definition.xml`. | ||
|
|
||
| This module contains only one class, `NamelistDefinition`, inheriting from | ||
| `GenericXML`. |
There was a problem hiding this comment.
Inherits from EntryID - I will fix.
|
|
||
|
|
||
| def _get_version(self): | ||
| version = self.root.get("version") |
There was a problem hiding this comment.
version 1 files may not have a version tag, i will fix.
| @@ -67,6 +67,8 @@ def parse_namelists(namelist_lines, filename): | |||
| comment_re = re.compile(r'^[#!]') | |||
| namelist_re = re.compile(r'^&(\S+)$') | |||
| name_re = re.compile(r"^([^\s=']+)\s*=\s*(.+)$") | |||
| #name_re = re.compile(r"^([^\s=':]+)\s*=\s*(.+)$") | |||
| _ymd_re = re.compile(r"%(?P<digits>[1-9][0-9]*)?y(?P<month>m(?P<day>d)?)?") | ||
|
|
||
| _stream_file_template = """ | ||
| <dataSource> |
There was a problem hiding this comment.
This is some psuedo xml code for generating stream files, the plan is to eventually get rid of this style of input and put streams into namelist files.
| @@ -21,8 +21,9 @@ def expect(condition, error_msg, exc_type=SystemExit): | |||
| """ | |||
| if (not condition): | |||
| # Uncomment these to bring up a debugger when an expect fails | |||
| #import pdb | |||
| #pdb.set_trace() | |||
| if logger.isEnabledFor(logging.DEBUG): | |||
There was a problem hiding this comment.
I got tired of commenting or uncommenting these lines. Now if you run with --debug they are enabled but not otherwise.
There was a problem hiding this comment.
Yeah, I also uncomment these lines frequently. I think this is a reasonable change; it might be better to add another standard option to control this, but I think this is fine for now. You may want to remove the "Uncomment these ..." comment above.
| from_dir=cimeroot).splitlines()) | ||
| #TODO - get rid of this | ||
| list_of_directories_to_ignore = ("scripts/Tools", "point_clm", "tools", "machines", "apidocs", "unit_test") | ||
| for file_ in files_to_test: |
There was a problem hiding this comment.
This makes each pylint file test a separate test in scripts_regression_tests and extends it to include the
scripts directory and the buildnml and buildexe from driver and component models. The list_of_directories_to_ignore is a todo list of files to update to conform to pylint requirements.
|
Annotation complete, enjoy! |
| @@ -21,8 +21,9 @@ def expect(condition, error_msg, exc_type=SystemExit): | |||
| """ | |||
| if (not condition): | |||
| # Uncomment these to bring up a debugger when an expect fails | |||
| #import pdb | |||
| #pdb.set_trace() | |||
| if logger.isEnabledFor(logging.DEBUG): | |||
There was a problem hiding this comment.
Yeah, I also uncomment these lines frequently. I think this is a reasonable change; it might be better to add another standard option to control this, but I think this is fine for now. You may want to remove the "Uncomment these ..." comment above.
* Fix HTML search not working Since Sphinx-1.7, Sphinx has exported search options as `documentation_options.js`. This starts to refer it instead of definitions of JavaScript variables. In addition, this also uses `js_tag()` function which added in 1.8 to support additional attributes for scripts (ex. async attribute). * Add code comment
Branch for PR review of #640 only, not intended to be merged
Test suite:
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]
Fixes [CIME Github issue #]
User interface changes?:
Code review: