From 711810d18ba91b9bec78f734b66a66b1733dc3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 30 Jun 2015 14:57:39 +0200 Subject: [PATCH] Switched to new version of versioneer Versions should now be PEP440 compatible. --- .versioneer-lookup | 11 +++++---- src/octoprint/_version.py | 24 +++++++++++++++++++ versioneer.py | 50 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index 7877abaa..2fd943bf 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -7,12 +7,13 @@ # The file is processed from top to bottom, the first matching line wins. If or are left out, # the lookup table does not apply to the matched branches -# master and staging shall not use the lookup table +# master shall not use the lookup table, only tags master -staging -# fix/ branches are fixes for master, so we don't handle those either -fix/.* +# maintenance is currently the branch for preparation of maintenance release 1.2.2 +# so are any fix/... branches +maintenance 1.2.2 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10 pep440-dev +fix/.* 1.2.2 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10 pep440-dev # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now -.* 1.3.0 198d3450d94be1a2 pep440-pre +.* 1.3.0 198d3450d94be1a2 pep440-dev diff --git a/src/octoprint/_version.py b/src/octoprint/_version.py index b96249a5..8064b06f 100644 --- a/src/octoprint/_version.py +++ b/src/octoprint/_version.py @@ -447,6 +447,28 @@ def render_pep440_post(pieces): return rendered +def render_pep440_dev(pieces): + """ TAG.dev[DISTANCE]+gHEX[.dirty] + + Exceptions: + 1: no tags. 0.devDISTANCE+gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".dev%d" % pieces["distance"] + else: + rendered += ".dev" + rendered += plus_or_dot(pieces) + else: + # exception #1 + rendered = "0.dev%d" % pieces["distance"] + rendered += "+" + rendered += "g%s" % pieces["short"] + if pieces["dirty"]: + rendered += ".dirty" + return rendered + def render_pep440_old(pieces): """TAG[.postDISTANCE[.dev0]] . @@ -531,6 +553,8 @@ def render(pieces, style): rendered = render_pep440_post(pieces) elif style == "pep440-old": rendered = render_pep440_old(pieces) + elif style == "pep440-dev": + rendered = render_pep440_dev(pieces) elif style == "git-describe": rendered = render_git_describe(pieces) elif style == "git-describe-long": diff --git a/versioneer.py b/versioneer.py index 51c6327d..f9cf9443 100644 --- a/versioneer.py +++ b/versioneer.py @@ -919,6 +919,28 @@ def render_pep440_post(pieces): return rendered +def render_pep440_dev(pieces): + """ TAG.dev[DISTANCE]+gHEX[.dirty] + + Exceptions: + 1: no tags. 0.devDISTANCE+gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".dev%%d" %% pieces["distance"] + else: + rendered += ".dev" + rendered += plus_or_dot(pieces) + else: + # exception #1 + rendered = "0.dev%%d" %% pieces["distance"] + rendered += "+" + rendered += "g%%s" %% pieces["short"] + if pieces["dirty"]: + rendered += ".dirty" + return rendered + def render_pep440_old(pieces): """TAG[.postDISTANCE[.dev0]] . @@ -1003,6 +1025,8 @@ def render(pieces, style): rendered = render_pep440_post(pieces) elif style == "pep440-old": rendered = render_pep440_old(pieces) + elif style == "pep440-dev": + rendered = render_pep440_dev(pieces) elif style == "git-describe": rendered = render_git_describe(pieces) elif style == "git-describe-long": @@ -1490,6 +1514,28 @@ def render_pep440_post(pieces): return rendered +def render_pep440_dev(pieces): + """ TAG.dev[DISTANCE]+gHEX[.dirty] + + Exceptions: + 1: no tags. 0.devDISTANCE+gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".dev%d" % pieces["distance"] + else: + rendered += ".dev" + rendered += plus_or_dot(pieces) + else: + # exception #1 + rendered = "0.dev%d" % pieces["distance"] + rendered += "+" + rendered += "g%s" % pieces["short"] + if pieces["dirty"]: + rendered += ".dirty" + return rendered + def render_pep440_old(pieces): """TAG[.postDISTANCE[.dev0]] . @@ -1574,6 +1620,8 @@ def render(pieces, style): rendered = render_pep440_post(pieces) elif style == "pep440-old": rendered = render_pep440_old(pieces) + elif style == "pep440-dev": + rendered = render_pep440_dev(pieces) elif style == "git-describe": rendered = render_git_describe(pieces) elif style == "git-describe-long": @@ -1722,6 +1770,8 @@ def get_cmdclass(): vers = get_versions(verbose=True) print("Version: %s" % vers["version"]) print(" full-revisionid: %s" % vers.get("full-revisionid")) + if "branch" in vers: + print(" branch: %s" % vers["branch"]) print(" dirty: %s" % vers.get("dirty")) if vers["error"]: print(" error: %s" % vers["error"])