[Git][reproducible-builds/diffoscope][master] 3 commits: Bump Standards-Version to 4.7.2.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
b5c78287 by Chris Lamb at 2025-03-21T09:50:12+00:00
Bump Standards-Version to 4.7.2.

- - - - -
ba827474 by Chris Lamb at 2025-03-21T12:21:24+00:00
Add missing subprocess import.

- - - - -
b448a4eb by Chris Lamb at 2025-03-21T12:41:07+00:00
Require the new, upcoming, version of file(1) and update quine testcase.


- - - - -


4 changed files:

- debian/control
- diffoscope/comparators/openssl.py
- tests/data/quine_expected_diff
- tests/test_quines.py


Changes:

=====================================
debian/control
=====================================
@@ -99,7 +99,7 @@ Build-Depends:
  zstd <!nocheck>,
 Build-Conflicts:
  graphicsmagick-imagemagick-compat,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Homepage: https://diffoscope.org
 Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git


=====================================
diffoscope/comparators/openssl.py
=====================================
@@ -18,6 +18,7 @@
 
 import logging
 import plistlib
+import subprocess
 
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference


=====================================
tests/data/quine_expected_diff
=====================================
@@ -1,3 +1,3 @@
 @@ -1 +1 @@
 -gzip compressed data, was "recursive", from FAT filesystem (MS-DOS, OS/2, NT)
-+Zip archive data, made by v2.0, extract using at least v2.0, last modified, last modified Sun, Mar 04 2010 00:24:16, uncompressed size 440, method=deflate
++Zip archive data, made by v2.0, extract using at least v2.0, last modified Mar 04 2010 00:24:16, uncompressed size 440, method=deflate


=====================================
tests/test_quines.py
=====================================
@@ -54,7 +54,7 @@ def differences(quine1, quine2):
     return quine1.compare(quine2).details
 
 
- at skip_unless_file_version_is_at_least("5.46")
+ at skip_unless_file_version_is_at_least("5.47")
 def test_difference(differences):
     assert_diff(differences[0], "quine_expected_diff")
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e7795330a10375c9661b40d0cb1220cf32f4b600...b448a4eb7d8fa360ae167cbe249ff2804f4238cb

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e7795330a10375c9661b40d0cb1220cf32f4b600...b448a4eb7d8fa360ae167cbe249ff2804f4238cb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20250321/a18a2f6d/attachment.htm>