-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Sat, 17 Sep 2016 13:24:00 +0000 Source: diffoscope Binary: diffoscope trydiffoscope Architecture: source all Version: 60~bpo8+1 Distribution: jessie-backports Urgency: medium Maintainer: Reproducible builds folks <reproducible-builds@lists.alioth.debian.org> Changed-By: Mattia Rizzolo <mattia@debian.org> Description: diffoscope - in-depth comparison of files, archives, and directories trydiffoscope - in-depth comparison of files, archives, etc. (try.diffoscope.org Closes: 835055 Changes: diffoscope (60~bpo8+1) jessie-backports; urgency=medium . * Rebuild for jessie-backports. * Backport from the master branch: + d/rules: makes possible to do a backport without changing the version "upstream". * Skip some tests that fails in jessie-backports. . diffoscope (60) unstable; urgency=medium . [ Chris Lamb ] * debian/rules: + Run tests with python3-coverage and generate reports post-build. * CONTRIBUTING: Add PyPI reference. * Comparators: + Avoid ugly DRY violations in diffoscope.comparators.__init__ by dynamically importing classes via a single list. + git: Specify paths as strings as required since b7830b5cb. + elf: - Mask more warnings (eg. "readelf: Error: the dynamic segment offset" or "size exceeds the size of the file"). - Specify string format arguments as logging function parameters, not using interpolation. + json: Correct behaviour of JSON comparator when file does not exist. * Presenters: + html: - Use html.escape over xml.sax.saxutils.escape. - Don't use unsafe cgi.escape method as its ``quote`` kwarg — which enables escaping of quotation marks — is False by default. * Code clean-up: + Tidy imports. + Split exceptions out into dedicated diffoscope.exc module. + Use try-except idiom instead of ``if`` in RequiredToolNotFound.get_package + Prefer kwargs[x] = kwargs.pop(x, 'default') idiom over ``if`` statements. * tests: + Factor out ugly os.path.join to a utility method. + Drop unused try_except in tests/conftest. + Add GitIndex tests to bring coverage of comparators/git.py to 100%. + Add tests for Haskell comparator. - Skip Haskell tests if GHC is not installed. - Skip Haskell tests if GHC version does not match. Closes: #835055 + Add test in JSON comparator for non-existing files. + Rewrite lengthy "[..] skipIf [..] tool_missing" with a @skip_unless_tools_exist decorator. + Add tests for skip_unless_tools_exist helper. + Rename tests/comparators/conftest.py -> tests/comparators/utils.py. + Avoid Don't-Repeat-Yourself violations by factoring out fixture loading. + Avoid more DRY violations by factoring-out non-existing file tests. + Remove some other unused imports from comparator tests. + Check rendering of text and HTML presenters when checking non-existing files. + Use `pytest.xfail` over `assert False`. . [ Mattia Rizzolo ] * debian/control: + Reinstated build profiles, now that dh-python is fixed (see #834238). + Version the build-dependency on dh-python, so it supports build profiles. + Add more nocheck build profiles. + Bump dependencies on debhelper and dpkg-dev to assure build profile support is available. + Add Build-Dependency on fontforge-extras for showttf (run during tests) + Alternate Build-Dependency on default-jdk-headless|default-jdk, to ease backporting to older Debian releases. * debian/rules: + Don't install '/usr/lib/python3/dist-packages/.coverage'. + Run the basic-command-line test during package build. + Be even more verbose about failing tests. + Allow building a mismatching version between diffoscope and the debian changelog if the target distribution is UNRELEASED. * Comparators + ppu: - Unbreak ppu_version detection. - Put code out of the context manager, it doesn't need to be within. * trydiffoscope: add copyright/license header. * autopkgtest/basic-command-line: + Enable running basic-command-line test without ADTTMP being set. + Be a bit more verbose about what is being tested. + Also test return code when passing an invalid command line flag. + Force LC_ALL=C.UTF-8, so that diffoscope can always output something. * test: + Factor out a tools_missing() function. + Rewrite tool_older_than() into skip_unless_tool_is_older_than(). + Skip test_squashfs.py.test_superblock if squashfs is too old. + Normalize xxd's output so that we can compare jessie's xxd with stretch's. * add default-jdk to the alternate packages for javap for Debian; default-jdk-headless is not available in older Debian releases. . [ Satyam Zode ] * Ignore differences in .buildinfo if all the other files listed in .changes are identical. In those cases any differences in .buildinfo files are irrelevant, and are actually a feature (as it indicates two reproducible builds with different environment). . [ Jérémy Bobbio ] * Properly skip tests requiring python-debian when unavailable. . [ Ximin Luo ] * Show the timestamp when logging, to detect which steps take longer. * Add a --no-max flag to disable all limits. * Have --max-report-size honour 0 to mean "no limit". * Comparators: + cbfs: only scan whole file when the filename ends with ".rom". + binary: Suppress decimal line numbers for xxd output. * Increase default --max-diff-input-lines to 2^20 (1048576) from 100000. * Rename --no-max-limits to --no-default-limits, a more accurate name. * presenters/html: html-dir output: + Split large diffs across several child pages. Also add some flags so html-dir behaviour is easier to reason about. + Use 4 times the given --max-diff-block-lines. This way, '--html x.html --html-dir y' gives reasonable output for both. * difference: + Fix behaviour for max-diff-block-limit=1 and don't report when 0 lines are removed. + Don't truncate diff output by default, instead add a separate flag --max-diff-block-lines-saved (infinite by default) to do so. Checksums-Sha1: 8fc5f87d06518e4b8ec53773328916cf8d1b9cd3 2820 diffoscope_60~bpo8+1.dsc 996fe2063a7181597646e120648c0a1224634ed4 310776 diffoscope_60~bpo8+1.tar.xz 4ddbec0557201647c0be40828f1b28323238f300 66602 diffoscope_60~bpo8+1_all.deb 1958207e5869a45c5a4a8b6c06c3dbd2546875f1 22158 trydiffoscope_60~bpo8+1_all.deb Checksums-Sha256: 4fc6cde4473bc6697a401fc9176c5e1661b6322d3a3071c2c901041a4505865d 2820 diffoscope_60~bpo8+1.dsc f3b06734d259701460047898cad3a823fd1081735e83c7c12d96956ae04b128f 310776 diffoscope_60~bpo8+1.tar.xz 9ebbe986d04e676edb42776301b6e9c2cce4af7338a5ba78efe091313c57b88c 66602 diffoscope_60~bpo8+1_all.deb fec66de3154f411090840564c1f518808f800d6780dd508a7a56b43499df34da 22158 trydiffoscope_60~bpo8+1_all.deb Files: 1827224d3bb45658422968bb78232b78 2820 devel optional diffoscope_60~bpo8+1.dsc ce073f4859cedb613135ea9fadf7c8c3 310776 devel optional diffoscope_60~bpo8+1.tar.xz f5fe4fd7780a66daa2ef7f6a6992fd3d 66602 devel optional diffoscope_60~bpo8+1_all.deb 55c5f3b5167c52cb85e198bcde6fe516 22158 devel optional trydiffoscope_60~bpo8+1_all.deb -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJX3UxiAAoJEEsEP825REVA2nQQAJKWSO7b3DDLbzakGG5NMfOM wjkeBLNnh0tGfw5CML58QzCxaCHlZkMFu+9GqXEBUwBEcEQWXmeErpR2JAEcjkfA 95TsBarsd3zwrMzbL8/U+0RZM8fF46vZXvMbcfbZPn1qkQe6FlO1p1qR57cswwxS E8a2fi96lE3j6mX4BwYojKLVH2m7s/XZFUkbrEv30k3Lrg9KBAqN+3sC811r4ecl LSHhEM/4DmDv/Y7zk0KQ3PIeO1cwCFQ9W/fvQ+VUBbYBHJkrpd6lBNULSgQOg+ig e4I6zMBkqp+N27p6lnQE7a/TuNTCiBrWnTpqNAwmtcFc5uw08Pdu4gUMqOYqGev9 q0EzSnUCCfyP0RCxmY3Cxyzx7swQysoKzzPSDXb/MU9ZYkv+W3v5iNYXPxGUhG3C k3wyo7cHhANP5QTw65psUbFAlMkh/z/JnBlgLks5hTdOUy5XWAJpQIaMiSah/Exg FjCAzfWfZTI1HS35cl3BZUhL3or1CNnpRInTEClkCuynKr5F6uRh1S7twb3Fd2EA kZIJ47QPb/TOTAioK/0xMqlUyZLW1CeGmCR9G9w9pYsYEiIP1cpNX73g+ILlyNFe O74lag6XIKKz0//jxGr7AXusHt1IBJhiQXBl3DznpIPOEHiCNd+v2ZMvyu+QNTuh HpVqGwgPj74QQiAi/Hvz =R2TU -----END PGP SIGNATURE-----