Merge pull request #127 from pypa/issue-126

Discard local parts when guessing next version.

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -1,3 +1,9 @@
+v1.15.1
+=======
+
+* fix issue #126: the local part of any tags is discarded
+  when guessing new versions
+
 v1.15.0
 =======
 

setuptools_scm/version.py

@@ -88,14 +88,29 @@ def meta(tag, distance=None, dirty=False, node=None, **kw):
 
 
 def guess_next_version(tag_version, distance):
-    version = str(tag_version)
-    if '.dev' in version:
-        prefix, tail = version.rsplit('.dev', 1)
-        assert tail == '0', 'own dev numbers are unsupported'
-        return '%s.dev%s' % (prefix, distance)
-    else:
-        prefix, tail = re.match('(.*?)(\d+)$', version).groups()
-        return '%s%d.dev%s' % (prefix, int(tail) + 1, distance)
+    version = _strip_local(str(tag_version))
+    bumped = _bump_dev(version) or _bump_regex(version)
+    suffix = '.dev%s' % distance
+    return bumped + suffix
+
+
+def _strip_local(version_string):
+    public, sep, local = version_string.partition('+')
+    return public
+
+
+def _bump_dev(version):
+    if '.dev' not in version:
+        return
+
+    prefix, tail = version.rsplit('.dev', 1)
+    assert tail == '0', 'own dev numbers are unsupported'
+    return prefix
+
+
+def _bump_regex(version):
+    prefix, tail = re.match('(.*?)(\d+)$', version).groups()
+    return '%s%d' % (prefix, int(tail) + 1)
 
 
 def guess_next_dev_version(version):

testing/test_functions.py

@@ -14,6 +14,7 @@ def __format__(self, *k):
     ('1.1', '1.2.dev0'),
     ('1.2.dev', '1.2.dev0'),
     ('1.1a2', '1.1a3.dev0'),
+    ('23.24.post2+deadbeef', '23.24.post3.dev0'),
     ])
 def test_next_tag(tag, expected):
     version = pkg_resources.parse_version(tag)