dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Write out git version information to a file, use in about box, remove all the other stuff until I can format it correctly

Browse Source
This commit is contained in:
blitzmann
2017-11-12 12:57:36 -05:00
parent d0235f6d93
commit df7dc30e7e
4 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -117,3 +117,4 @@ ENV/
# Pycharm project settings # Pycharm project settings
.idea .idea
eos.iml eos.iml
gitversion

8
config.py
View File

@@ -51,11 +51,17 @@ def getPyfaRoot():
return root return root
def getGitVersion():
with open(os.path.join(pyfaPath, 'gitversion')) as f:
version = f.readline()
return version
def getDefaultSave(): def getDefaultSave():
return os.path.expanduser(os.path.join("~", ".pyfa")) return os.path.expanduser(os.path.join("~", ".pyfa"))
def defPaths(customSavePath): def defPaths(customSavePath=None):
global debug global debug
global pyfaPath global pyfaPath
global savePath global savePath

50
gui/mainFrame.py
View File

@@ -359,31 +359,31 @@ class MainFrame(wx.Frame):
v = sys.version_info v = sys.version_info
info = wx.adv.AboutDialogInfo() info = wx.adv.AboutDialogInfo()
info.Name = "pyfa" info.Name = "pyfa"
info.Version = gui.aboutData.versionString info.Version = config.getGitVersion() # gui.aboutData.versionString
#
try: # try:
import matplotlib # import matplotlib
matplotlib_version = matplotlib.__version__ # matplotlib_version = matplotlib.__version__
except: # except:
matplotlib_version = None # matplotlib_version = None
#
info.Description = wordwrap(gui.aboutData.description + "\n\nDevelopers:\n\t" + # info.Description = wordwrap(gui.aboutData.description + "\n\nDevelopers:\n\t" +
"\n\t".join(gui.aboutData.developers) + # "\n\t".join(gui.aboutData.developers) +
"\n\nAdditional credits:\n\t" + # "\n\nAdditional credits:\n\t" +
"\n\t".join(gui.aboutData.credits) + # "\n\t".join(gui.aboutData.credits) +
"\n\nLicenses:\n\t" + # "\n\nLicenses:\n\t" +
"\n\t".join(gui.aboutData.licenses) + # "\n\t".join(gui.aboutData.licenses) +
"\n\nEVE Data: \t" + gamedata_version + # "\n\nEVE Data: \t" + gamedata_version +
"\nPython: \t\t" + '{}.{}.{}'.format(v.major, v.minor, v.micro) + # "\nPython: \t\t" + '{}.{}.{}'.format(v.major, v.minor, v.micro) +
"\nwxPython: \t" + wx.__version__ + # "\nwxPython: \t" + wx.__version__ +
"\nSQLAlchemy: \t" + sqlalchemy.__version__ + # "\nSQLAlchemy: \t" + sqlalchemy.__version__ +
"\nmatplotlib: \t {}".format(matplotlib_version if matplotlib_version else "Not Installed"), # "\nmatplotlib: \t {}".format(matplotlib_version if matplotlib_version else "Not Installed"),
500, wx.ClientDC(self)) # 500, wx.ClientDC(self))
if "__WXGTK__" in wx.PlatformInfo: # if "__WXGTK__" in wx.PlatformInfo:
forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425" # forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425"
else: # else:
forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425" # forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425"
info.WebSite = (forumUrl, "pyfa thread at EVE Online forum") # info.WebSite = (forumUrl, "pyfa thread at EVE Online forum")
wx.adv.AboutBox(info) wx.adv.AboutBox(info)
def showCharacterEditor(self, event): def showCharacterEditor(self, event):

9
pyfa.spec
View File

@@ -2,6 +2,13 @@
import os import os
from itertools import chain from itertools import chain
import subprocess
label = subprocess.check_output([
"git", "describe", "--tags"]).strip()
with open('gitversion', 'w+') as f:
f.write(label.decode())
block_cipher = None block_cipher = None
@@ -15,6 +22,7 @@ added_files = [
( 'eve.db', '.' ), ( 'eve.db', '.' ),
( 'README.md', '.' ), ( 'README.md', '.' ),
( 'LICENSE', '.' ), ( 'LICENSE', '.' ),
( 'gitversion', '.' ),
] ]
import_these = [] import_these = []
@@ -32,7 +40,6 @@ for root, folders, files in chain.from_iterable(os.walk(path) for path in paths)
a = Analysis([r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa\pyfa.py'], a = Analysis([r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa\pyfa.py'],
pathex=[ pathex=[
r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa',
# Need this, see https://github.com/pyinstaller/pyinstaller/issues/1566 # Need this, see https://github.com/pyinstaller/pyinstaller/issues/1566
# To get this, download and install windows 10 SDK # To get this, download and install windows 10 SDK
# If not building on Windows 10, this might be optional # If not building on Windows 10, this might be optional