From 78836add28a32c7d3a643a6c428e2fe3aa8a774f Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Sat, 2 Mar 2019 14:21:13 -0500 Subject: [PATCH 1/2] update requirements --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0f75a043c..f60d414e1 100644 --- a/requirements.txt +++ b/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>=4.2b1 PyInstaller == 3.3 \ No newline at end of file From 9fc16cb287a83a7870ae74341b3c539a845018b8 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Sat, 2 Mar 2019 14:31:16 -0500 Subject: [PATCH 2/2] more updates --- config.py | 2 +- dist_assets/win/dist.py | 2 +- requirements.txt | 2 +- scripts/dump_version.py | 2 +- scripts/sdeReadIcons.py | 2 +- service/jargon/loader.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.py b/config.py index 4e1234e90..59c4fae55 100644 --- a/config.py +++ b/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 diff --git a/dist_assets/win/dist.py b/dist_assets/win/dist.py index bff55018a..e8d6f4ae5 100644 --- a/dist_assets/win/dist.py +++ b/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') diff --git a/requirements.txt b/requirements.txt index f60d414e1..0c7d59c65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ markdown2==2.3.5 packaging==16.8 roman==2.0.0 beautifulsoup4==4.6.0 -pyyaml>=4.2b1 +pyyaml>=5.1b1 PyInstaller == 3.3 \ No newline at end of file diff --git a/scripts/dump_version.py b/scripts/dump_version.py index 4b3a9583e..c506bfdb9 100644 --- a/scripts/dump_version.py +++ b/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 diff --git a/scripts/sdeReadIcons.py b/scripts/sdeReadIcons.py index d099f6bd5..aba3866fe 100644 --- a/scripts/sdeReadIcons.py +++ b/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()): diff --git a/service/jargon/loader.py b/service/jargon/loader.py index be34a298e..541bd0a4b 100644 --- a/service/jargon/loader.py +++ b/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):