diffoscope 299__tar.gz → 301__tar.gz

{diffoscope-299/diffoscope.egg-info → diffoscope-301}/PKG-INFO

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

{diffoscope-299 → diffoscope-301}/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 = "299"
+VERSION = "301"

{diffoscope-299 → diffoscope-301}/diffoscope/comparators/hdf.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2020, 2025 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,6 +30,12 @@ class H5dump(Command):
     def cmdline(self):
         return ["h5dump", self.path]
 
+    def filter(self, line):
+        # Strip absolute `HDF5 "/path/to/filename.db"`
+        return re.sub(
+            r"^(HDF5) \"[^\"]+\"", "\\1", line.decode("utf-8")
+        ).encode("utf-8")
+
 
 class Hdf5File(File):
     DESCRIPTION = "Hierarchical Data Format database"

{diffoscope-299 → diffoscope-301}/diffoscope/comparators/odt.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2017-2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2017-2022, 2025 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,13 +17,14 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import re
+import functools
 import subprocess
 
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
 from .utils.file import File
-from .utils.command import Command
+from .utils.command import Command, our_check_output
 
 
 class Odt2txt(Command):
@@ -37,9 +38,10 @@ class Odt2txt(Command):
         return ("odt2txt", "--width=-1", self.path)
 
     @staticmethod
+    @functools.lru_cache
     def odt2txt_variant():
         try:
-            out = subprocess.check_output(["odt2txt", "--version"])
+            out = our_check_output(["odt2txt", "--version"])
         except subprocess.CalledProcessError as e:
             out = e.output
         return out.decode("UTF-8").splitlines()[0].split()[0].strip()

{diffoscope-299 → diffoscope-301}/diffoscope/comparators/utils/compare.py

@@ -68,10 +68,12 @@ def compare_root_paths(path1, path2):
     file2 = FilesystemFile(path2, container=container2)
 
     with profile("has_same_content_as", file1):
-        if file1.has_same_content_as(file2):
-            return None
+        is_binary_identical = file1.has_same_content_as(file2)
 
-    difference = compare_files(file1, file2)
+    if is_binary_identical:
+        difference = None
+    else:
+        difference = compare_files(file1, file2)
 
     if Config().exclude_directory_metadata in ("no", "recursive"):
         meta = compare_meta(path1, path2)

{diffoscope-299 → diffoscope-301}/diffoscope/comparators/zip.py

@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
+
+import functools
 import re
 import sys
 import shutil
@@ -35,6 +37,7 @@ from .utils.archive import Archive, ArchiveMember
 from .utils.command import Command, our_check_output
 
 
+@functools.lru_cache()
 def zipdetails_version():
     return our_check_output(["zipdetails", "--version"]).decode("UTF-8")
 

{diffoscope-299 → diffoscope-301/diffoscope.egg-info}/PKG-INFO

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

{diffoscope-299 → diffoscope-301}/tests/comparators/test_directory.py

@@ -19,12 +19,15 @@
 
 import os
 import shutil
+import time
+
 import pytest
 
 from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.directory import compare_directories
 from diffoscope.comparators.utils.compare import compare_root_paths
 from diffoscope.comparators.utils.specialize import specialize
+from diffoscope.config import Config
 
 from ..utils.data import data, get_data, assert_diff
 
@@ -125,3 +128,20 @@ def test_compare_both_ways(tmpdir):
 
     assert_diff(compare_root_paths(a, b), "test_directory_a_b_diff")
     assert_diff(compare_root_paths(b, a), "test_directory_b_a_diff")
+
+
+def test_identical_files_different_mtime(monkeypatch, tmpdir):
+
+    monkeypatch.setattr(Config(), "exclude_directory_metadata", "no")
+
+    file1_path = str(tmpdir.join("file1"))
+    file2_path = str(tmpdir.join("file2"))
+
+    now = time.time()
+    for path, t in ((file1_path, now - 3600), (file2_path, now)):
+        with open(path, "w") as f:
+            f.write("identical content")
+        os.utime(path, (t, t))
+
+    difference = compare_root_paths(file1_path, file2_path)
+    assert difference is not None

{diffoscope-299 → diffoscope-301}/tests/comparators/test_hdf.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2020, 2025 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,22 +16,19 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-import re
 import pytest
 
 from diffoscope.comparators.hdf import Hdf5File
 from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.utils.specialize import specialize
 
-from ..utils.data import load_fixture, get_data
+from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist, skip_unless_module_exists
 from ..utils.nonexisting import assert_non_existing
 
 hdf5_1 = load_fixture("test1.hdf5")
 hdf5_2 = load_fixture("test2.hdf5")
 
-re_normalise = re.compile(r'(HDF5 ")[^\"]+/([^\"]+")')
-
 
 def hdf5_fixture(prefix):
     @pytest.fixture
@@ -41,8 +38,8 @@ def hdf5_fixture(prefix):
         # Listed in debian/tests/control.in
         import h5py
 
-        with h5py.File(filename, "w"):
-            pass
+        with h5py.File(filename, "w") as f:
+            f.create_dataset(prefix, (100,), dtype="i")
 
         return specialize(FilesystemFile(filename))
 
@@ -72,12 +69,7 @@ def differences(hdf5_1, hdf5_2):
 @skip_unless_tools_exist("h5dump")
 @skip_unless_module_exists("h5py")
 def test_diff(differences):
-    expected_diff = get_data("hdf5_expected_diff")
-    # Remove absolute build path
-    normalised = re_normalise.sub(
-        lambda m: m.group(1) + m.group(2), differences[0].unified_diff
-    )
-    assert normalised == expected_diff
+    assert_diff(differences[0], "hdf5_expected_diff")
 
 
 @skip_unless_tools_exist("h5dump")

diffoscope-301/tests/data/hdf5_expected_diff

@@ -0,0 +1,12 @@
+@@ -1,10 +1,10 @@
+ HDF5 {
+ GROUP "/" {
+-   DATASET "test1" {
++   DATASET "test2" {
+       DATATYPE  H5T_STD_I32LE
+       DATASPACE  SIMPLE { ( 100 ) / ( 100 ) }
+       DATA {
+       (0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       (22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       (44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       (66): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

diffoscope-299/tests/data/hdf5_expected_diff

@@ -1,6 +0,0 @@
-@@ -1,4 +1,4 @@
--HDF5 "test1.db" {
-+HDF5 "test2.db" {
- GROUP "/" {
- }
- }