diff options
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2010-08-26 00:20:57 +0200 |
---|---|---|
committer | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2010-08-26 00:20:57 +0200 |
commit | 4445c4081ea552c3200c56a2dc074f9f4fe95f39 (patch) | |
tree | f46e471d7e716d1c6a1f0b4aa2bd9efb4e1ac1f7 | |
parent | 9d089dd4bd4404b11da92121b23be5ee28c1faef (diff) | |
download | setuptools-scm-4445c4081ea552c3200c56a2dc074f9f4fe95f39.tar.gz |
according to :pep:386 .dev is only valid for before a release, since we are after it use the .post sheme
-rw-r--r-- | hgdistver.py | 10 | ||||
-rw-r--r-- | test_hgdistver.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/hgdistver.py b/hgdistver.py index a4c56ce..a9233c1 100644 --- a/hgdistver.py +++ b/hgdistver.py @@ -53,7 +53,7 @@ def version_from_hg_id(root, cachefile=None): def version_from_hg15_parents(root, cachefile=None): node = hg('id -i', root) if node.strip('+') == '000000000000': - return '0.0.dev0-' + node + return '0.0.post0-' + node cmd = 'parents --template "{latesttag} {latesttagdistance}"' out = hg(cmd, root) @@ -61,7 +61,7 @@ def version_from_hg15_parents(root, cachefile=None): tag, dist = out.split() if tag == 'null': tag = '0.0' - return '%s.dev%s-%s' % (tag, dist, node) + return '%s.post%s-%s' % (tag, dist, node) except ValueError: pass # unpacking failed, old hg @@ -82,9 +82,9 @@ def version_from_hg_log_with_tags(root, cachefile=None): line = line.decode() tags = [t for t in line.split() if not t.isalpha()] if tags: - return '%s.dev%s-%s' % (tags[0], dist, node) + return '%s.post%s-%s' % (tags[0], dist, node) - return '0.0.dev%s-%s' % (dist + 1, node) + return '0.0.post%s-%s' % (dist + 1, node) def version_from_hg(root, cachefile=None): @@ -108,7 +108,7 @@ def _archival_to_version(data): if 'tag' in data: return data['tag'] elif 'latesttag' in data: - return '%(latesttag)s.dev%(latesttagdistance)s-%(node).12s' % data + return '%(latesttag)s.post%(latesttagdistance)s-%(node).12s' % data else: return data.get('node', '')[:12] diff --git a/test_hgdistver.py b/test_hgdistver.py index 723cfb9..aebeccc 100644 --- a/test_hgdistver.py +++ b/test_hgdistver.py @@ -26,7 +26,7 @@ def test_data_from_archival(tmpdir): archival_mapping = { '1.0': {'tag': '1.0'}, - '1.0.dev3-000000000000': { + '1.0.post3-000000000000': { 'latesttag': '1.0', 'latesttagdistance': '3', 'node': '0'*20, @@ -60,18 +60,18 @@ def test_version_from_hg_id(tmpdir, get_log_version): cwd = str(tmpdir) hg('init', cwd) initial = get_log_version(cwd) - assert initial.startswith('0.0.dev0-' + '0'*12 ) #uses node when no tag + assert initial.startswith('0.0.post0-' + '0'*12 ) #uses node when no tag tmpdir.join('test.txt').write('test') hg('add test.txt', cwd) hg('commit -m commit -u test -d "0 0"', cwd) after_first_commit = get_log_version(tmpdir) - assert after_first_commit.startswith('0.0.dev1-') + assert after_first_commit.startswith('0.0.post1-') hg('tag 0.1 -u test -d "0 0"', cwd) after_tag_01 = get_log_version(cwd) - assert after_tag_01.startswith('0.1.dev1-') + assert after_tag_01.startswith('0.1.post1-') hg('up 0.1', cwd) at_tag_01 = get_version(cwd) @@ -92,7 +92,7 @@ def test_version_from_archival(tmpdir): 'latesttagdistance: 3\n' ) - assert get_version(tmpdir) == '0.1.dev3-000000000000' + assert get_version(tmpdir) == '0.1.post3-000000000000' def test_version_from_cachefile(tmpdir): |