Persistence tests now writing non-int output in true YAML format.

CMakeLists.txt

@@ -34,6 +34,7 @@ option(BORNAGAIN_CRASHHANDLER "Additional machinery to send crash reports" OFF)
 option(BORNAGAIN_TIFF_SUPPORT "Tiff files read/write support" ON)
 option(AUTOGENERATE "Regenerate directory auto (Py docs, Py wrappers, man page)" OFF)
 option(ZERO_TOLERANCE "Terminate compilation on warnings" OFF)
+option(UNITTESTS "Don't skip unit tests" ON)
 
 if(AUTOGENERATE)
     set(BORNAGAIN_MANPAGE ON)
@@ -64,11 +65,15 @@ endif()
 add_subdirectory(ThirdParty)
 add_subdirectory(Fit)
 add_subdirectory(Core)
-add_subdirectory(Tests/UnitTests/Core)
-add_subdirectory(Tests/UnitTests/Fit)
+if(UNITTESTS)
+    add_subdirectory(Tests/UnitTests/Core)
+    add_subdirectory(Tests/UnitTests/Fit)
+endif()
 if(BORNAGAIN_GUI)
     add_subdirectory(GUI)
-    add_subdirectory(Tests/UnitTests/GUI)
+    if(UNITTESTS)
+        add_subdirectory(Tests/UnitTests/GUI)
+    endif()
 endif()
 add_subdirectory(Tests/Functional)  # functional tests (ctest)
 

Tests/ReferenceData/PyPersist/SpecularSimulation.ref.yaml

-Simulation passed
+Simulation passed
\ No newline at end of file
+...

Wrap/python/plot_utils.py

@@ -52,27 +52,28 @@ def yamlDump(filename, data):
     """
     Saves an arbitrary hierarchical data set as YAML-formatted text file.
     """
-#     import yaml
-#     global yaml
-#     class ImprovedDumper(Dumper):
-#         pass
-#     def odict_representer(dumper, data):
-#         return dumper.represent_mapping(
-#             yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG,
-#             data.items())
-#     def flowseq_representer(dumper, data):
-#         return dumper.represent_sequence(
-#             yaml.resolver.BaseResolver.DEFAULT_SEQUENCE_TAG,
-#             data,
-#             flow_style=True )
-#     ImprovedDumper.add_representer(OrderedDict, odict_representer)
-#     ImprovedDumper.add_representer(FlowSeq, flowseq_representer)
+    import yaml
+    global yaml
+    from collections import OrderedDict
+    class FlowSeq( list ):
+        pass
+    class ImprovedDumper(yaml.Dumper):
+        pass
+    def odict_representer(dumper, data):
+        return dumper.represent_mapping(
+            yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG,
+            data.items())
+    def flowseq_representer(dumper, data):
+        return dumper.represent_sequence(
+            yaml.resolver.BaseResolver.DEFAULT_SEQUENCE_TAG,
+            data,
+            flow_style=True )
+    ImprovedDumper.add_representer(OrderedDict, odict_representer)
+    ImprovedDumper.add_representer(FlowSeq, flowseq_representer)
     with open(filename+".yaml", "w") as f:
-        f.write(data)
-# TODO
-#        f.write(yaml.dump(data, None, ImprovedDumper,
-#                          allow_unicode=True, encoding='utf-8',
-#                          default_flow_style=False, indent=4, width=70))
+        f.write(yaml.dump(data, None, ImprovedDumper,
+                          allow_unicode=True, encoding='utf-8',
+                          default_flow_style=False, indent=4, width=70))
 
 
 def getFilenameOrPlotflag():

cmake/bornagain/modules/SearchInstalledSoftware.cmake

@@ -58,6 +58,7 @@ if(BORNAGAIN_PYTHON OR BORNAGAIN_GUI)
     endif()
     message(STATUS "Found Python libraries version ${PYTHONLIBS_VERSION_STRING} at ${PYTHON_LIBRARIES}; includes at ${PYTHON_INCLUDE_DIRS}")
     find_package(Numpy REQUIRED)
+    find_package(PyYaml REQUIRED)
 endif()
 
 # --- Swig ---

cmake/generic/modules/FindPyYaml.cmake

+# Find the python-yaml module.
+# This module defines PYYAML_FOUND.
+
+exec_program ("${PYTHON_EXECUTABLE}"
+  ARGS "-c 'import yaml; print(yaml.__version__)'"
+  OUTPUT_VARIABLE pyyaml_version_number
+  RETURN_VALUE PYYAML_NOT_FOUND)
+
+if (PYYAML_NOT_FOUND)
+    message(FATAL_ERROR "python-yaml not found (ret='${PYYAML_NOT_FOUND}', out='${pyyaml_version_number}')")
+    set(PYYAML_FOUND FALSE)
+else()
+    message (STATUS "Found python module yaml, version ${pyyaml_version_number}.")
+    set(PYYAML_FOUND TRUE)
+endif()