openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp.

Commit message:
Make our version number PEP 440 compliant.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353547
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp.

=== modified file 'setup.py'
--- setup.py	2017-12-29 09:15:48 +0000
+++ setup.py	2018-08-22 04:10:52 +0000
@@ -99,10 +99,11 @@
     if tree_revision == tag_revision:
         version_string = tag_version.decode('utf-8')
     else:
-        version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8'))
+        version_string = '{version}-dev{revision}'.format(version=tag_version.decode('utf-8'),
+                                                          revision=tree_revision.decode('utf-8'))
     ver_file = open(VERSION_FILE, 'w')
     ver_file.write(version_string)
-except:
+except Exception:
     ver_file = open(VERSION_FILE, 'r')
     version_string = ver_file.read().strip()
 finally: