Merge pull request #411 from apdavison/issue367

Fix for #367 - handle YAML files with both .yml and .yaml extensions

Author: apdavison

sumatra/core.py

@@ -129,10 +129,13 @@ def register(self, component):
                     if not hasattr(component, attr):
                         raise TypeError("%s is missing required attribute %s" % (component, attr))
                 if hasattr(component, "name"):
-                    name = component.name
+                    names = [component.name]
+                elif hasattr(component, "names"):
+                    names = component.names
                 else:
-                    name = component.__name__
-                self._components[base_class][name] = component
+                    names = [component.__name__]
+                for name in names:
+                    self._components[base_class][name] = component
                 return
         raise TypeError("%s is not a Sumatra component." % component)
 

sumatra/parameters.py

@@ -132,7 +132,7 @@ class YAMLParameterSet(ParameterSet):
     Handles parameter files in YAML format, as parsed by the
     PyYAML module
     """
-    name = ".yaml"
+    names = (".yaml", ".yml")
 
     def __init__(self, initialiser):
         """

test/unittests/test_parameters.py

@@ -513,6 +513,8 @@ def setUp(self):
         if yaml_loaded:
             with open("test_file.yaml", "w") as f:
                 f.write(init2)
+            with open("test_file.yml", "w") as f:
+                f.write(init2)
 
     def tearDown(self):
         os.remove("test_file.simple")
@@ -548,6 +550,12 @@ def test__build_parameters_yaml(self):
         self.assertEqual(P.as_dict(), {'x': 2, 'y': {'a': 3, 'b': 4}})
         self.assertIsInstance(P, YAMLParameterSet)
 
+    @unittest.skipUnless(yaml_loaded, "PyYAML not available")
+    def test__build_parameters_yml(self):
+        P = build_parameters("test_file.yml")
+        self.assertEqual(P.as_dict(), {'x': 2, 'y': {'a': 3, 'b': 4}})
+        self.assertIsInstance(P, YAMLParameterSet)
+
 
 # these tests should now be applied to commands.parse_arguments and/or commands.parse_command_line_parameter()
     #def test__build_parameters__should_add_new_command_line_parameters_to_the_file_parameters(self):