diff -Nru trydiffoscope-67.0.3/debian/changelog trydiffoscope-67.0.4/debian/changelog --- trydiffoscope-67.0.3/debian/changelog 2019-10-23 08:35:43.000000000 +0000 +++ trydiffoscope-67.0.4/debian/changelog 2020-01-12 17:23:32.000000000 +0000 @@ -1,7 +1,16 @@ +trydiffoscope (67.0.4) unstable; urgency=medium + + * Add trydiffoscope script to MANIFEST. + (Closes: reproducible-builds/trydiffoscope#1) + * Add a suitable shebang and executable bit to setup.py. + * Update Black source code formatting. + + -- Chris Lamb Sun, 12 Jan 2020 17:23:32 +0000 + trydiffoscope (67.0.3) unstable; urgency=medium * Move to Build-Depends on python3-docutils over python-docutils to allow for - * Python 2.x removal. (Closes: #943293) + Python 2.x removal. (Closes: #943293) -- Chris Lamb Wed, 23 Oct 2019 09:35:43 +0100 diff -Nru trydiffoscope-67.0.3/MANIFEST trydiffoscope-67.0.4/MANIFEST --- trydiffoscope-67.0.3/MANIFEST 2019-10-23 08:35:43.000000000 +0000 +++ trydiffoscope-67.0.4/MANIFEST 2020-01-12 17:23:32.000000000 +0000 @@ -1,3 +1,4 @@ trydiffoscope.1.rst README.rst pyproject.toml +trydiffoscope diff -Nru trydiffoscope-67.0.3/setup.py trydiffoscope-67.0.4/setup.py --- trydiffoscope-67.0.3/setup.py 2019-10-23 08:35:43.000000000 +0000 +++ trydiffoscope-67.0.4/setup.py 2020-01-12 17:23:32.000000000 +0000 @@ -1,8 +1,10 @@ +#!/usr/bin/env python3 + from distutils.core import setup setup( name='trydiffoscope', - version='67.0.3', + version='67.0.4', author="Chris Lamb", author_email="lamby@debian.org", scripts=('trydiffoscope',), diff -Nru trydiffoscope-67.0.3/trydiffoscope trydiffoscope-67.0.4/trydiffoscope --- trydiffoscope-67.0.3/trydiffoscope 2019-10-23 08:35:43.000000000 +0000 +++ trydiffoscope-67.0.4/trydiffoscope 2020-01-12 17:23:32.000000000 +0000 @@ -33,10 +33,13 @@ self.session = requests.Session() def main(self): - response = self.session.post(self.args.endpoint, files={ - 'file_a': open(self.args.file[0], 'rb'), - 'file_b': open(self.args.file[1], 'rb'), - }) + response = self.session.post( + self.args.endpoint, + files={ + 'file_a': open(self.args.file[0], 'rb'), + 'file_b': open(self.args.file[1], 'rb'), + }, + ) response.raise_for_status() poll_uri = response.json()['result']['uri'] @@ -61,10 +64,12 @@ time.sleep(1) if comparison['state'] not in ('identical', 'different'): - print("E: Received state '{}' from server. See {}".format( - comparison['state'], - comparison['uri'], - ), file=sys.stderr) + print( + "E: Received state '{}' from server. See {}".format( + comparison['state'], comparison['uri'], + ), + file=sys.stderr, + ) return 2 if comparison['state'] == 'identical': @@ -92,10 +97,7 @@ parser = argparse.ArgumentParser() parser.add_argument( - 'file', - help="files to compare", - nargs=2, - default=[], + 'file', help="files to compare", nargs=2, default=[], ) parser.add_argument( @@ -105,15 +107,11 @@ ) parser.add_argument( - '--text', - help="write plain text output to given file", - default=None, + '--text', help="write plain text output to given file", default=None, ) parser.add_argument( - '--html', - help="write HTML report to given file", - default=None, + '--html', help="write HTML report to given file", default=None, ) parser.add_argument( @@ -127,7 +125,7 @@ '-w', '--webbrowser', help="open webbrowser to URL instead of managing results " - "locally (implies -u)", + "locally (implies -u)", action='store_true', )