Merge pull request #695 from campagnola/version-update
Version string update
This commit is contained in:
commit
6f0e8ebe3f
@ -4,7 +4,7 @@ PyQtGraph - Scientific Graphics and GUI Library for Python
|
||||
www.pyqtgraph.org
|
||||
"""
|
||||
|
||||
__version__ = '0.10.0'
|
||||
__version__ = '0.11.0.dev0'
|
||||
|
||||
### import all the goodies and add some helper functions for easy CLI use
|
||||
|
||||
|
@ -436,11 +436,14 @@ def getVersionStrings(pkg):
|
||||
## Finally decide on a version string to use:
|
||||
if forcedVersion is not None:
|
||||
version = forcedVersion
|
||||
elif gitVersion is not None and getGitBranch() != 'debian': # ignore git version if this is debian branch
|
||||
version = gitVersion
|
||||
sys.stderr.write("Detected git commit; will use version string: '%s'\n" % version)
|
||||
else:
|
||||
version = initVersion
|
||||
# if git says this is a modified branch, add local version information
|
||||
if gitVersion is not None:
|
||||
_, local = gitVersion.split('+')
|
||||
if local != '':
|
||||
version = version + '+' + local
|
||||
sys.stderr.write("Detected git commit; will use version string: '%s'\n" % version)
|
||||
|
||||
return version, forcedVersion, gitVersion, initVersion
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user