Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle
2017-02-28 14:25:38 +01:00
29 changed files with 548 additions and 55 deletions

View File

@ -32,7 +32,7 @@ if "dev" in __version__:
import os
import subprocess
if os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", ".git")):
r = subprocess.run(["git", "rev-parse", "--short", "HEAD"], stdout=subprocess.PIPE).stdout.decode().strip("\n")
r = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode().strip("\n")
__version__ += "-" + r
except Exception as e:
print(e)