ASCEE
/
pyqtgraph
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update version string to 0.11.0.dev0 and handling in setup 

Merge commit '1a3a0a70930b' into version-update
This commit is contained in:
Luke Campagnola 2018-05-30 08:53:32 -07:00
parent cfc9759502 1a3a0a7093
commit 349625c875
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyqtgraph/__init__.py
View File

@ -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

9
tools/setupHelpers.py
View File

@ -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