Accepting request 1255405 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1255405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/diffoscope?expand=0&rev=48

diffoscope-272.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10574313c7f048ff9af2a67351bc18b6f96f6e61af7750aba19f64b3ccdb2a78
-size 3155265

diffoscope-272.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmaIADgACgkQHpU+J9Qx
-HljVSA//Ul9b0grmlcq4lrrCh7LEH7vvKunRd86po031QcWxZDUkzTM8XqHcOG2Y
-48AJC+KdTGzzB7xPUDlRO7m7XBBG5AisOL3E9pfF3uzoaMD99INfyPdfJ7Fjo4K6
-Q/W7n2kiCzUls9FiwrwXgFlrbsYADPnJnSesjg/d52TA3+pzK1ACaDVvYDbUVSTd
-lHO6tzqyyaqqSgepDpP+zzfPgmtf+EwrRDfLxA+IXjggeq7TgpFCPwvoeMo5a3Ee
-oXmAHQC+YynDHcY83yuXQ0u2FWs64UP3Gigasa/4gClxx4h2lI4jVBWgKWagu9xT
-dOehAl2RRLZT4rgicGiOKjvmnpqu9JMjLrBltPz10MzlgXZFvLZDPI+hB9FD0aBi
-e+iGdmqxN75Wvo2utK41wKYKM5B7lZwtQGDBfcnScJezRKXbSz6P2ZIRI9rW1RS3
-UqZUrYjrs7RoPHbSy4RGRPINExpFhckDuEFyR10Q0BojGgAdZEqap9v7HwN4hjav
-xMhP5OuhsuRfNKbBSvEe+e+PicgvH6Ywkb/ucOBBbGaBAwZ2V76+/5zf8+17eRSP
-w5cClu2M8tlLt3MXl/++Qs7y6f2L5NME++7FijE6qr0mF7If+c1HyZPYUzLY4UJO
-aiqR5H0365rz6f9fLW2WLrui8cpS+Db/OMPQ6CTw9cjWdjqLdS4=
-=EHMm
------END PGP SIGNATURE-----

diffoscope-291.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dee9e1ce82980df0333d5222ed68ccc351d021507d9f2fd8cc2cbe00f562c88a
+size 3157327

diffoscope-291.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmfdc6sACgkQHpU+J9Qx
+Hlj1UBAAseNjGwQdnaJZLm14itVR9gHmXaCViFrwiK6V1cUa3JtpWZJ91j2+R5Gh
+MuNKXs/zNLLrh+tEQa/7WXn+5JM2R7x6DV/VmyQ+HtZZH8RR8S/5/GegvPVKaCER
+32u5lt07xHI5fAEWLhd3Gg4r49pizLpxbmq0F1h/61f12U2754y6ou8tykL0oJ+r
+i0AHV/zSv5Mw6BoeCqjRX+GrDAoBsY0aZIRepHzLWyi6nenIPPhG0P4zq5t30eRw
+jQhQWpRCdI+qyhr/OF9yzXnNVF7lZ8pGcvSukvIUn7n7KPxzp8zgZXiHoC1hLydO
+Wbzfn+R7brnaFQB/kLlD6P5xUax/Tmbj3bMtSBD00ARWFvXPwTYqTDK/jTACL+6l
+Jm8HzqOOeAMBh0130m3qJj4HiT6prPZx3xbjXK3IycUXslB+qLzdQSw6lRlYVof2
+GyZSlkbRXb0LHuoK7xCDpDdnBNbSH6PATL+Ve9yYuoszi3QD6jAhuw/lNxUXpPz0
+PDVb8iw/Jq1O9ehFNL8LdmWCRCxqI19VfiKNfMYmQurQ3YmoxilMx64BcA7XwEPQ
+tdI8mOa5GtE6p58qb/j8uk4X3tzv/pqipi2i99PY6BavM5HZGX7LgpGhKJEFS/tm
+AX19PebLRfbyy6c3z526kHEy6suLg87Du1S2sDp0/sWl1aOgdaU=
+=vFCC
+-----END PGP SIGNATURE-----

diffoscope.changes

@@ -1,3 +1,145 @@
+-------------------------------------------------------------------
+Sun Mar 23 14:10:37 UTC 2025 - Andrea Manzini <andrea.manzini@suse.com>
+
+- update to version 291:
+  * Make two required adjustments for the new version of the src:file package:
+    file(1) version 5.46 now emits "XHTML document" for .xhtml files, such as
+    those found nested within our .epub tests. Therefore, match this string
+    when detecting XML files. This was causing an FTBFS due to inconsistent
+    indentation in diffoscope's output.
+  * Require the new, upcoming, version of file(1) for a quine-related
+    testcase after adjusting the expected output. Previous versions of
+    file(1) had a duplicated "last modified, last modified" string for some
+    Zip archives that has now been removed.
+  * Add a missing subprocess import.
+  * Bump Standards-Version to 4.7.2.
+
+- update to version 290:
+  * Also consider .aar files as APK files for the sake of not falling back to a
+    binary diff. (Closes: #1099632)
+  * Ensure all calls to out_check_output in the ELF comparator have the
+    potential CalledProcessError exception caught. (Re: #398)
+  * Ensure a potential CalledProcessError is caught in the OpenSSL comparator
+    as well.
+
+- update to version 289:
+  * Catch CalledProcessError when calling html2text.
+
+- update to version 288:
+  * Add 'asar' to DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS. (Closes: #1095057)
+  * Update minimal 'black' version.
+
+- update to version 287:
+  * Drop an unused subprocess import.
+  * Update copyright years.
+  * Add ASAR comparator.
+
+- update to version 286:
+  * Bug fixes:
+  - When passing files on the command line, don't call specialize(..) before
+    we've checked that the files are identical. In the worst case, this was
+    resulting in spinning up binwalk and extracting two entire filesystem
+    images merely to confirm that they were indeed filesystem images..
+    before simply concluding that they were identical anyway.
+  - Do not exit with a traceback if paths are inaccessible, either directly,
+    via symbolic links or within a directory. (Closes: #1065498)
+  - Correctly identify changes to only the line-endings of files; don't mark
+    them as "Ordering differences only".
+  - Use the "surrogateescape" mechanism of str.{decode,encode} to avoid a
+    UnicodeDecodeError and crash when decoding zipinfo output that is not
+    valid UTF-8. (Closes: #1093484)
+  * Testsuite changes:
+  - Don't mangle newlines when opening test fixtures; we want them untouched.
+  - Move to assert_diff in test_text.py.
+  * Misc:
+  - Remove unnecessary return value from check_for_ordering_differences in
+    the Difference class.
+  - Drop an unused function in iso9600.py
+  - Inline a call/check of Config().force_details; no need for an additional
+    variable.
+
+- update to version 285:
+  * Validate --css command-line argument. Thanks to Daniel Schmidt @ SRLabs for
+    the report. (Closes: #396)
+  * Prevent XML entity expansion attacks through vulnerable versions of
+    pyexpat. Thanks to Florian Wilkens @ SRLabs for the report. (Closes: #397)
+  * Print a warning if we have disabled XML comparisons due to a potentially
+    vulnerable version of pyexpat.
+  * Remove (unused) logging facility from a few comparators.
+
+-------------------------------------------------------------------
+Sun Dec 22 20:29:42 UTC 2024 - Sebastian Wagner <sebix@sebix.at>
+
+- update to version 284:
+ - Simplify tests_quines.py::test_{differences,differences_deb} to use
+   assert_diff and not mangle the expected test output.
+ - Update some tests to support file(1) version 5.46.
+   (Closes: reproducible-builds/diffoscope#395)
+- update test skips, remove test_diff, add test_obj_identification
+
+-------------------------------------------------------------------
+Mon Dec  2 21:08:30 UTC 2024 - Sebastian Wagner <sebix@sebix.at>
+
+- update to version 283:
+ - Fix crash when objdump is missing when checking .EFI files.
+- update to version 282:
+ - Ignore errors when listing .ar archives. (Closes: #1085257)
+ - Update copyright years.
+- update to version 281:
+ - Don't try and test with systemd-ukify within Debian stable.
+ - Add support for UKI files.
+- update to version 280:
+ - Drop Depends on deprecated python3-pkg-resources. (Closes: #1083362)
+- update to version 279:
+ - Drop removal of calculated basename from readelf output.
+   (Closes: reproducible-builds/diffoscope#394)
+- update to version 278:
+ - Temporarily remove procyon-decompiler from Build-Depends as it was removed
+   from testing (#1057532). (Closes: #1082636)
+ - Add a helpful contextual message to the output if comparing Debian .orig
+   tarballs within .dsc files without the ability to "fuzzy-match" away the
+   leading directory. (Closes: reproducible-builds/diffoscope#386)
+ - Correctly invert "X% similar" value and do not emit "100% similar".
+   (Closes: reproducible-builds/diffoscope#391)
+ - Update copyright years.
+- update to version 277:
+ - Don't crash when attempting to hashing symlinks with targets that point to
+   a directory.
+- update to version 276:
+ - Also catch RuntimeError when importing PyPDF so that PyPDF or, crucially,
+   its transitive dependencies do not cause diffoscope to traceback at runtime
+   and build time. (Closes: #1078944, reproducible-builds/diffoscope#389)
+ - Factor out a method for stripping ANSI escapes.
+ - Strip ANSI escapes from the output of Procyon. Thanks, Aman Sharma!
+ - Update copyright years.
+- update to version 275:
+ - Update the test_zip.py text fixtures and definitions to support new changes
+   to IO::Compress. (Closes: #1078050)
+ - Do not call marshal.loads(...) of precompiled Python bytecode as it is
+   inherently unsafe. Replace, at least for now, with a brief summary of the
+   code section of .pyc files. (Re: reproducible-builds/diffoscope#371)
+ - Don't bother to check the Python version number in test_python.py: the
+   fixture for this test is deterministic/fixed.
+ - Update copyright years.
+- update to version 274:
+ - Add support for IO::Compress::Zip >= 2.212. (Closes: #1078050)
+ - Don't include debug output when calling dumppdf(1).
+ - Append output from dumppdf(1) in more cases.
+   (Closes: reproducible-builds/diffoscope#387)
+ - Update copyright years.
+ - Update the available architectures for test dependencies.
+- update to version 273:
+ - Factor out version detection in test_jpeg_image. (Re:
+   reproducible-builds/diffoscope#384)
+ - Ensure that 'convert' is from Imagemagick 6.x; we will need to update a
+   few things with IM7. (Closes: reproducible-builds/diffoscope#384)
+ - Correct import of identify_version after refactoring change in 037bdcbb0.
+ - tests:
+   + Add OpenSSH key test with a ed25519 key.
+   + Skip the OpenSSH test with DSA key if openssh is >> 9.7
+   + Support ffmpeg >= 7 that adds some extra context to the diff
+ - Do not ignore testing in gitlab-ci.
+
 -------------------------------------------------------------------
 Tue Jul  9 13:21:55 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

diffoscope.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package diffoscope
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           diffoscope
-Version:        272
+Version:        291
 Release:        0
 Summary:        In-depth comparison of files, archives, and directories
 License:        GPL-3.0-or-later
@@ -37,7 +37,6 @@ BuildRequires:  python3-setuptools
 Requires:       python3-curses
 Requires:       python3-libarchive-c
 Requires:       python3-python-magic
-Requires:       python3-setuptools
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 # Tools required for proper function of this program
@@ -135,8 +134,7 @@ fi
 
 %check
 # test_identification https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/98
-# comparators/test_python/test_diff https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/284#note_280561
+py.test-%{python3_bin_suffix} -k 'not (test_python or test_identification or test_obj_identification)'
-py.test-%{python3_bin_suffix} -k 'not ((test_python and test_diff) or test_identification)'
 
 %files
 %doc README.rst