[Reproducible-commits] [debbindiff] 01/05: Display version in HTML and --version output

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository debbindiff.

commit 36cdc374f0591113b1d83e2f922fc22a90138dfc
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Oct 2 13:05:21 2014 +0200

    Display version in HTML and --version output
---
 debbindiff.py                 | 4 +++-
 debbindiff/__init__.py        | 2 ++
 debbindiff/presenters/html.py | 6 +++---
 setup.py                      | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debbindiff.py b/debbindiff.py
index b2ef897..6723225 100755
--- a/debbindiff.py
+++ b/debbindiff.py
@@ -23,7 +23,7 @@ from __future__ import print_function
 import argparse
 import logging
 import sys
-from debbindiff import logger
+from debbindiff import logger, VERSION
 import debbindiff.comparators
 from debbindiff.presenters.html import output_html
 
@@ -32,6 +32,8 @@ def create_parser():
     parser = argparse.ArgumentParser(
         description='Highlight differences between two builds '
                     'of Debian packages')
+    parser.add_argument('--version', action='version',
+                        version='debbindiff %s' % VERSION)
     parser.add_argument('--debug', dest='debug', action='store_true',
                         default=False)
     parser.add_argument('--html', metavar='output', dest='html_output')
diff --git a/debbindiff/__init__.py b/debbindiff/__init__.py
index 2adb128..d609326 100644
--- a/debbindiff/__init__.py
+++ b/debbindiff/__init__.py
@@ -19,6 +19,8 @@
 
 import logging
 
+VERSION = "3"
+
 logger = logging.getLogger("debbindiff")
 logger.setLevel(logging.WARNING)
 ch = logging.StreamHandler()
diff --git a/debbindiff/presenters/html.py b/debbindiff/presenters/html.py
index 7390f25..18d9a0f 100644
--- a/debbindiff/presenters/html.py
+++ b/debbindiff/presenters/html.py
@@ -23,7 +23,7 @@ import re
 import subprocess
 import sys
 from xml.sax.saxutils import escape
-from debbindiff import logger
+from debbindiff import logger, VERSION
 from debbindiff.comparators.utils import make_temp_directory
 
 HEADER = """
@@ -81,7 +81,7 @@ HEADER = """
 """
 
 FOOTER = """
-<div class="footer">Generated by debbindiff</div>
+<div class="footer">Generated by debbindiff %(version)s</div>
 </body>
 </html>
 """
@@ -172,4 +172,4 @@ def output_html(differences, print_func=None):
         logger.debug('print limit reached')
         print_func("<div class='error'>Max output size reached.</div>",
                    force=True)
-    print_func(FOOTER, force=True)
+    print_func(FOOTER % {'version': VERSION}, force=True)
diff --git a/setup.py b/setup.py
index ebbea76..c2d987b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python2
 
 from setuptools import setup, find_packages
+import debbindiff
 
 setup(name='debbindiff',
-      version='2',
+      version=debbindiff.VERSION,
       description='display differences between files',
       long_description=open('README').read(),
       author='Lunar',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debbindiff.git