Merge branch 'req_updates' into origin_master

config.py

@@ -104,7 +104,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

dist_assets/win/dist.py

@@ -8,7 +8,7 @@ import yaml
 
 
 with open("version.yml", 'r') as file:
-    data = yaml.load(file)
+    data = yaml.load(file, Loader=yaml.FullLoader)
     version = data['version']
 
 os.environ["PYFA_DIST_DIR"] = os.path.join(os.getcwd(), 'dist')

requirements.txt

@@ -1,13 +1,13 @@
-wxPython == 4.0.0b2
+wxPython == 4.0.4
 logbook >= 1.0.0
 matplotlib >= 2.0.0
 python-dateutil
 requests >= 2.0.0
 sqlalchemy == 1.0.5
-cryptography ==2.2.2
+cryptography>=2.3
 markdown2==2.3.5
 packaging==16.8
 roman==2.0.0
 beautifulsoup4==4.6.0
-PyYAML==3.12
+pyyaml>=5.1b1
 PyInstaller == 3.3

scripts/dump_version.py

@@ -10,7 +10,7 @@ import os
 
 
 with open("version.yml", 'r+') as file:
-    data = yaml.load(file)
+    data = yaml.load(file, Loader=yaml.FullLoader)
     file.seek(0)
     file.truncate()
     # todo: run Version() on the tag to ensure that it's of proper formatting - fail a test if not and prevent building

scripts/sdeReadIcons.py

@@ -10,7 +10,7 @@ import json
 iconDict = {}
 
 stream = open('iconIDs.yaml', 'r')
-docs = yaml.load_all(stream)
+docs = yaml.load_all(stream, Loader=yaml.FullLoader)
 
 for doc in docs:
     for k,v in list(doc.items()):

service/jargon/loader.py

@@ -43,9 +43,9 @@ class JargonLoader(object):
                 self.jargon_mtime != self._get_jargon_file_mtime())
 
     def _load_jargon(self):
-        jargondata = yaml.load(DEFAULT_DATA)
+        jargondata = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
         with open(JARGON_PATH) as f:
-            userdata = yaml.load(f)
+            userdata = yaml.load(f, Loader=yaml.FullLoader)
         jargondata.update(userdata)
         self.jargon_mtime = self._get_jargon_file_mtime()
         self._jargon = Jargon(jargondata)
@@ -57,7 +57,7 @@ class JargonLoader(object):
 
     @staticmethod
     def init_user_jargon(jargon_path):
-        values = yaml.load(DEFAULT_DATA)
+        values = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
 
         # Disabled for issue/1533; do not overwrite existing user config
         # if os.path.exists(jargon_path):