[trydiffoscope] 02/06: Move canonical version handling to setup.py, but check they match in debian/rules. (Closes: #888882)

Chris Lamb chris at chris-lamb.co.uk
Tue Jan 30 22:26:33 UTC 2018


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

lamby pushed a commit to branch master
in repository trydiffoscope.

commit ee26fa2ee0111e87d49bc1e3d8db1b444037e82b
Author: Chris Lamb <lamby at debian.org>
Date:   Tue Jan 30 22:11:42 2018 +0000

    Move canonical version handling to setup.py, but check they match in debian/rules. (Closes: #888882)
---
 debian/rules | 8 ++++++++
 setup.py     | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index bb19417..a9b5751 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
+
+SETUP_PY_VERSION := $(shell python3 setup.py --version)
+
+ifneq ($(DEB_VERSION),$(SETUP_PY_VERSION))
+$(error Version in debian/changelog does not match setup.py)
+endif
+
 MANPAGES = trydiffoscope.1
 
 %:
diff --git a/setup.py b/setup.py
index 520fd72..eae387a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,8 @@
-import subprocess
-
 from distutils.core import setup
 
-VERSION = subprocess.check_output(
-    ('dpkg-parsechangelog', '-S', 'Version'),
-).decode('utf-8').strip()
-
 setup(
     name='trydiffoscope',
-    version=VERSION,
+    version=66,
     author="Chris Lamb",
     author_email="lamby at debian.org",
     scripts=(

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



More information about the Reproducible-commits mailing list