diff --git a/pyqtgraph/__init__.py b/pyqtgraph/__init__.py index 4ac5e646..2db79985 100644 --- a/pyqtgraph/__init__.py +++ b/pyqtgraph/__init__.py @@ -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 diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py index 939bca4e..4afec66b 100644 --- a/tools/setupHelpers.py +++ b/tools/setupHelpers.py @@ -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