Skip to content
Snippets Groups Projects
Unverified Commit b6563976 authored by Daniel's avatar Daniel
Browse files

Merge branch 'dev' into release-v0.2.4

parents fc763322 510a8467
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 1 deletion
setup.py
+ 4
− 1
View file @ b6563976
...@@ -50,7 +50,10 @@ MINOR = 2 ...@@ -50,7 +50,10 @@ MINOR = 2
MICRO = 4 MICRO = 4
PRE = "" # e.g. rc0, alpha.1, 0.beta-23 PRE = "" # e.g. rc0, alpha.1, 0.beta-23
ISRELEASED = True ISRELEASED = True
VERSION = "{}.{}.{}{}".format(MAJOR, MINOR, MICRO, PRE) if PRE:
VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
else:
VERSION = "{}.{}.{}".format(MAJOR, MINOR, MICRO)
# Return the git revision as a string # Return the git revision as a string
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment