Define appversion_nobuild in config.py for use elsewhere

Already need this in update.py, but will also adjust the 'Release Notes'
URL to use this, not full version.
This commit is contained in:
Athanasius committed 2020-07-19 11:45:06 +01:00
1 parent dc9597fb0c
commit ef3f14daaa
2 files changed
+5 -4

No files matched your search

+3 -1
View File
@@ -11,7 +11,9 @@ appcmdname = 'EDMC'
# appversion **MUST** follow Semantic Versioning rules:
# <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata)
appversion = '4.0.2'
appversion = '4.0.2' #-rc1+a872b5f'
# For some things we want appversion without (possible) +build metadata
appversion_nobuild = appversion.split(sep='+')[0]
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'
update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml'
+2 -3
View File
@@ -6,7 +6,7 @@ import threading
from traceback import print_exc
# ensure registry is set up on Windows before we start
from config import appname, appversion, update_feed, update_interval, config
from config import appname, appversion, appversion_nobuild, update_feed, update_interval, config
if not getattr(sys, 'frozen', False):
@@ -100,8 +100,7 @@ elif sys.platform=='win32':
# NB: It 'accidentally' supports pre-release due to how it
# splits and compares strings:
# <https://github.com/vslavik/winsparkle/issues/214>
appversion_nobuildmetadata = appversion.split(sep='+')[0]
self.updater.win_sparkle_set_app_build_version(appversion_nobuildmetadata)
self.updater.win_sparkle_set_app_build_version(appversion_nobuild)
# set up shutdown callback
global root