Merge branch 'master' into colour-item-list

2019-03-02 15:27:54 -05:00
parent 9bdb4ea967 dddec72f13
commit 8d0c2c18d2
16 changed files with 543 additions and 125 deletions
--- a/config.py
+++ b/config.py
@@ -110,7 +110,7 @@ def defPaths(customSavePath=None):
    # Version data

    with open(os.path.join(pyfaPath, "version.yml"), 'r') as file:
-        data = yaml.load(file)
+        data = yaml.load(file, Loader=yaml.FullLoader)
        version = data['version']

    # Where we store the saved fits etc, default is the current users home directory