From 680cb1885eb297d1f6abc3b4a23398176a5c56f1 Mon Sep 17 00:00:00 2001 From: computergeek125 Date: Mon, 22 Mar 2021 00:05:45 -0500 Subject: [PATCH] Moved to semver --- app/classes/shared/helpers.py | 5 +++-- app/config/version.json | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 927c583e..e1517084 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -154,9 +154,10 @@ class Helpers: version_data = self.get_version() # set some defaults if we don't get version_data from our helper - version = "{}.{}.{}".format(version_data.get('major', '?'), + version = "{}.{}.{}-{}".format(version_data.get('major', '?'), version_data.get('minor', '?'), - version_data.get('sub', '?')) + version_data.get('sub', '?'), + version_data.get('patch', '?')) return str(version) def do_exit(self): diff --git a/app/config/version.json b/app/config/version.json index 67dbc605..927ea033 100644 --- a/app/config/version.json +++ b/app/config/version.json @@ -1,5 +1,6 @@ { "major": 4, "minor": 0, - "sub": "Alpha 2+noshell" + "sub": 0, + "meta": "alpha.2" }