diffoscope 267__tar.gz → 268__tar.gz

{diffoscope-267 → diffoscope-268}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 267
+Version: 268
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-267 → diffoscope-268}/debian/changelog

@@ -1,8 +1,24 @@
-diffoscope (268) UNRELEASED; urgency=medium
+diffoscope (269) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby@debian.org>  Fri, 17 May 2024 08:40:22 +0100
+ -- Chris Lamb <lamby@debian.org>  Fri, 24 May 2024 08:35:07 +0100
+
+diffoscope (268) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Drop apktool from Build-Depends; we can still test our APK code
+    via autopkgtests. (Closes: #1071410)
+  * Fix tests for 7zip version 24.05.
+  * Add a versioned dependency for at least version 5.4.5 for the xz
+    tests; they fail under (at least xz 5.2.8).
+    (Closes: reproducible-builds/diffoscope#374)
+
+  [ Vagrant Cascadian ]
+  * Relax Chris' versioned xz test dependency (5.4.5) to also allow
+    version 5.4.1.
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 24 May 2024 08:29:57 +0100
 
 diffoscope (267) unstable; urgency=medium
 

{diffoscope-267 → diffoscope-268}/debian/control

@@ -13,7 +13,6 @@ Build-Depends:
  androguard <!nocheck>,
  apksigcopier <!nocheck>,
  apksigner <!nocheck>,
- apktool [!ppc64el !s390x] <!nocheck>,
  bash-completion,
  binutils-multiarch <!nocheck>,
  black <!nocheck>,

{diffoscope-267 → diffoscope-268}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "267"
+VERSION = "268"

{diffoscope-267 → diffoscope-268}/diffoscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 267
+Version: 268
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-267 → diffoscope-268}/tests/comparators/test_sevenz.py

@@ -16,8 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-import shutil
 import pytest
+import shutil
+import subprocess
 
 from diffoscope.comparators.gzip import GzipFile
 from diffoscope.comparators.sevenz import SevenZFile
@@ -25,13 +26,21 @@ from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.utils.specialize import specialize
 
 from ..utils.data import load_fixture, assert_diff
-from ..utils.tools import skip_unless_tools_exist
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
 sevenza = load_fixture("test1.disk.gz")
 sevenzb = load_fixture("test2.disk.gz")
 
 
+def sevenz_version():
+    try:
+        out = subprocess.check_output(["7z"])
+    except subprocess.CalledProcessError as e:
+        out = e.output
+    return out.decode("UTF-8").split()[1].strip()
+
+
 def test_identification(sevenza):
     assert isinstance(sevenza, GzipFile)
 
@@ -69,6 +78,7 @@ def test_content_source_without_extension(tmpdir, sevenza, sevenzb):
 
 
 @skip_unless_tools_exist("7z")
+@skip_unless_tool_is_at_least("7z", sevenz_version, "24.05")
 def test_metadata_diff(differences):
     assert_diff(differences[0].details[0], "text_sevenzmetadata_expected_diff")
 

{diffoscope-267 → diffoscope-268}/tests/comparators/test_xz.py

@@ -18,6 +18,7 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import shutil
+import subprocess
 import pytest
 
 from diffoscope.comparators.xz import XzFile
@@ -25,7 +26,7 @@ from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.utils.specialize import specialize
 
 from ..utils.data import load_fixture, assert_diff
-from ..utils.tools import skip_unless_tools_exist
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
 xz1 = load_fixture("test1.xz")
@@ -34,6 +35,14 @@ xz3 = load_fixture("test3.xz")
 xz4 = load_fixture("test4.xz")
 
 
+def xz_version():
+    try:
+        out = subprocess.check_output(["xz", "--version"])
+    except subprocess.CalledProcessError as e:
+        out = e.output
+    return out.decode("UTF-8").split()[3].strip()
+
+
 def test_identification(xz1):
     assert isinstance(xz1, XzFile)
 
@@ -83,6 +92,7 @@ def differences_verbose(xz3, xz4):
 
 
 @skip_unless_tools_exist("xz")
+@skip_unless_tool_is_at_least("xz", xz_version, "5.4.1")
 def test_content_source_verbose(differences_verbose):
     assert differences_verbose[0].source1 == "xz --list"
     assert differences_verbose[0].source2 == "xz --list"

{diffoscope-267 → diffoscope-268}/tests/data/text_sevenzmetadata_expected_diff

@@ -1,11 +1,11 @@
-@@ -5,13 +5,13 @@
- Scanning the drive for archives:
+@@ -6,13 +6,13 @@
  1 file, 131072 bytes (128 KiB)
  
  
  --
  Type = GPT
  Physical Size = 131072
+ Sector Size = 512
 -ID = BEFEFA22-EED4-4977-8407-46CD48ABC5D9
 +ID = A2E15781-E1B6-422C-BA65-9210D36BE3AA