Merge branch 'master' into price_optimize

This commit is contained in:
DarkPhoenix
2019-03-07 13:13:17 +03:00
24 changed files with 612 additions and 161 deletions

View File

@@ -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

View File

@@ -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()):