valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12218 from s0undt3ch/issues/12205-invlude-version-codename

Browse Source 
Include version codename in generated version string
This commit is contained in:
Thomas S Hatch 2014-04-23 17:24:55 -06:00
commit eccc0c580d
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
salt/version.py
View File

@ -17,11 +17,11 @@ except ImportError:
else:
string_types = basestring
# ----- ATTENTION ----------------------------------------------------------->
# ----- ATTENTION --------------------------------------------------------------------------------------------------->
#
# For version bumps, please update `__saltstack_version__` below
#
# <---- ATTENTION ------------------------------------------------------------
# <---- ATTENTION ----------------------------------------------------------------------------------------------------
class SaltStackVersion(object):
@ -52,10 +52,10 @@ class SaltStackVersion(object):
# latest release so we can map deprecation warnings to versions.
# ----- Please refrain from fixing PEP-8 E203 ----------------------->
# ----- Please refrain from fixing PEP-8 E203 --------------------------------------------------------------->
# The idea is keep this readable
# --------------------------------------------------------------------
'Hydrogen': (sys.maxint - 108, 0, 0, 0),
# ------------------------------------------------------------------------------------------------------------
'Hydrogen': (2014, 1, 0, 0),
'Helium': (sys.maxint - 107, 0, 0, 0),
'Lithium': (sys.maxint - 106, 0, 0, 0),
'Beryllium': (sys.maxint - 105, 0, 0, 0),
@ -164,11 +164,12 @@ class SaltStackVersion(object):
#'Bohrium' : (sys.maxint - 2 , 0, 0, 0),
#'Hassium' : (sys.maxint - 1 , 0, 0, 0),
#'Meitnerium' : (sys.maxint - 0 , 0, 0, 0),
# <---- Please refrain from fixing PEP-8 E203 ------------------------
# <---- Please refrain from fixing PEP-8 E203 ----------------------------------------------------------------
}
LNAMES = dict((k.lower(), v) for (k, v) in NAMES.iteritems())
VNAMES = dict((v, k) for (k, v) in NAMES.iteritems())
RMATCH = dict((v[:2], k) for (k, v) in NAMES.iteritems())
def __init__(self, # pylint: disable=C0103
major,
@ -275,6 +276,9 @@ class SaltStackVersion(object):
version_string += 'rc{0}'.format(self.rc)
if self.noc and self.sha:
version_string += '-{0}-{1}'.format(self.noc, self.sha)
if (self.major, self.minor) in self.RMATCH:
version_string += ' ({0})'.format(self.RMATCH[(self.major, self.minor)])
return version_string
@property
@ -330,17 +334,26 @@ class SaltStackVersion(object):
return '<{0} {1}>'.format(self.__class__.__name__, ' '.join(parts))
# ----- Hardcoded Salt Version Information ---------------------------------->
# ----- Hardcoded Salt Version Information -------------------------------------------------------------------------->
#
# Please bump version information for __saltstack_version__ on new releases
# ----------------------------------------------------------------------------
__saltstack_version__ = SaltStackVersion(2014, 1, 0)
# ALL version bumps should be done in the SaltStackVersion.NAMES dictionary, ie:
#
# class SaltStackVersion(object):
#
# NAMES = {
# 'Hydrogen': (2014, 1, 0, 0), # <- This is the tuple to bump versions
# ( ... )
# }
#
# --------------------------------------------------------------------------------------------------------------------
# There's no need to edit any of the version dunder objects below, see above why and where to update
__saltstack_version__ = SaltStackVersion.from_name('Hydrogen')
__version_info__ = __saltstack_version__.info
__version__ = __saltstack_version__.string
# <---- Hardcoded Salt Version Information -----------------------------------
# <---- Hardcoded Salt Version Information ---------------------------------------------------------------------------
# ----- Dynamic/Runtime Salt Version Information ---------------------------->
# ----- Dynamic/Runtime Salt Version Information -------------------------------------------------------------------->
def __get_version(version, version_info):
'''
If we can get a version provided at installation time or from Git, use
@ -348,7 +361,7 @@ def __get_version(version, version_info):
'''
try:
# Try to import the version information provided at install time
from salt._version import __version__, __version_info__ # pylint: disable=E0611
from salt._version import __version__, __version_info__ # pylint: disable=E0611,F0401
return __version__, __version_info__
except ImportError:
pass
@ -434,7 +447,7 @@ def __get_version(version, version_info):
__version__, __version_info__ = __get_version(__version__, __version_info__)
# This function has executed once, we're done with it. Delete it!
del __get_version
# <---- Dynamic/Runtime Salt Version Information -----------------------------
# <---- Dynamic/Runtime Salt Version Information ---------------------------------------------------------------------
def versions_information(include_salt_cloud=False):