Centralize version string getting. Still trying to work out how we should handle automatic version increments so we don't have to modify files all the time. Remove version file from repo (should only be a thing when building binaries)

This commit is contained in:
blitzmann
2018-02-17 11:10:42 -05:00
parent e779bb84e2
commit 82e3db1ffb
6 changed files with 16 additions and 13 deletions

View File

@@ -95,10 +95,6 @@ if __name__ == "__main__":
if options.rootsavedata is True:
config.saveInRoot = True
# set title if it wasn't supplied by argument
if options.title is None:
options.title = "pyfa %s%s - Python Fitting Assistant" % (config.version, "" if config.tag.lower() != 'git' else " (git)")
config.debug = options.debug
config.loggingLevel = config.LOGLEVEL_MAP.get(options.logginglevel.lower(), config.LOGLEVEL_MAP['error'])
config.defPaths(options.savepath)
@@ -131,6 +127,10 @@ if __name__ == "__main__":
from gui.mainFrame import MainFrame
# set title if it wasn't supplied by argument
if options.title is None:
options.title = "pyfa %s - Python Fitting Assistant" % (config.getVersion())
pyfa = wx.App(False)
mf = MainFrame(options.title)
ErrorHandler.SetParent(mf)