Browse code

prefer PEP440 formatting to strict semver

Miniver is, after all, for Python projects.

Christian Marquardt authored on 07/03/2018 14:25:15 • Joseph Weston committed on 07/03/2018 14:29:37
Showing 1 changed files
... ...
@@ -32,22 +32,20 @@ def get_version(version_file=STATIC_VERSION_FILE):
32 32
             version = get_version_from_git_archive(version_info)
33 33
         if not version:
34 34
             version = Version("unknown", None, None)
35
-        return semver_format(version)
35
+        return pep440_format(version)
36 36
     else:
37 37
         return version
38 38
 
39 39
 
40
-def semver_format(version_info):
40
+def pep440_format(version_info):
41 41
     release, dev, labels = version_info
42 42
 
43 43
     version_parts = [release]
44 44
     if dev:
45
-        if release.endswith('-dev'):
45
+        if release.endswith('-dev') or release.endswith('.dev'):
46 46
             version_parts.append(dev)
47
-        elif release.contains('-'):
47
+        else:  # prefer PEP440 over stric adhesion to semver
48 48
             version_parts.append('.dev{}'.format(dev))
49
-        else:
50
-            version_parts.append('-dev{}'.format(dev))
51 49
 
52 50
     if labels:
53 51
         version_parts.append('+')