Switched to new version of versioneer

Versions should now be PEP440 compatible.
(cherry picked from commit 711810d)

.versioneer-lookup

@@ -12,11 +12,11 @@ master
 
 # maintenance is currently the branch for preparation of maintenance release 1.2.8
 # so are any fix/... branches
-maintenance 1.2.8-dev 6c622f7c4332b71c6ece59552ffc87c146155c84
-fix/.* 1.2.8-dev 6c622f7c4332b71c6ece59552ffc87c146155c84
+maintenance 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
+fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
 
 # Special case disconnected checkouts, e.g. 'git checkout <tag>'
 \(detached.*
 
 # 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

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":

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"])