diffoscope 288__tar.gz → 290__tar.gz

{diffoscope-288/diffoscope.egg-info → diffoscope-290}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: diffoscope
-Version: 288
+Version: 290
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers
@@ -40,6 +40,18 @@ Requires-Dist: python-debian; extra == "comparators"
 Requires-Dist: pyxattr; extra == "comparators"
 Requires-Dist: rpm-python; extra == "comparators"
 Requires-Dist: tlsh; extra == "comparators"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 diffoscope
 ==========

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

{diffoscope-288 → diffoscope-290}/diffoscope/comparators/apk.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2016 Reiner Herrmann <reiner@reiner-h.de>
-# Copyright © 2016-2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2022, 2025 Chris Lamb <lamby@debian.org>
 # Copyright © 2022 FC Stegerman <flx@obfusk.net>
 #
 # diffoscope is free software: you can redistribute it and/or modify
@@ -238,7 +238,7 @@ class ApkFile(ZipFileBase):
     DESCRIPTION = "Android APK files"
     FILE_TYPE_HEADER_PREFIX = b"PK\x03\x04"
     FILE_TYPE_RE = re.compile(r"^(Android package|(Java|Zip) archive data)\b")
-    FILE_EXTENSION_SUFFIX = {".apk"}
+    FILE_EXTENSION_SUFFIX = {".apk", ".aar"}
     CONTAINER_CLASSES = [ApkContainer, ZipContainer]
 
     @property

{diffoscope-288 → diffoscope-290}/diffoscope/comparators/elf.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2024 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-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
@@ -167,10 +167,14 @@ class ReadElfSection(Readelf):
     @staticmethod
     def base_options():
         if not hasattr(ReadElfSection, "_base_options"):
-            output = our_check_output(
-                [get_tool_name("readelf"), "--help"],
-                stderr=subprocess.DEVNULL,
-            ).decode("us-ascii", errors="replace")
+            try:
+                output = our_check_output(
+                    [get_tool_name("readelf"), "--help"],
+                    stderr=subprocess.DEVNULL,
+                ).decode("us-ascii", errors="replace")
+            except subprocess.CalledProcessError as e:
+                logger.warning("Unable to get readelf options", e)
+                output = ""
 
             ReadElfSection._base_options = []
             for x in ("--decompress",):
@@ -513,7 +517,10 @@ class ElfContainer(DecompilableContainer):
             raise OutputParsingError(command, self)
 
         if not has_debug_symbols:
-            self._install_debug_symbols()
+            try:
+                self._install_debug_symbols()
+            except subprocess.CalledProcessError as e:
+                logger.warning("Error when installing ELF debug symbols", e)
 
         if has_build_id:
             try:

{diffoscope-288 → diffoscope-290}/diffoscope/comparators/html.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2022 Chris Lamb <lamby@debian.org>
+# Copyright © 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,6 +17,7 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import re
+import subprocess
 
 from diffoscope.difference import Difference
 from diffoscope.exc import RequiredToolNotFound
@@ -49,5 +50,7 @@ class HtmlFile(TextFile):
                 difference.add_details([text])
         except RequiredToolNotFound as exc:  # noqa
             difference.add_comment(exc.get_comment())
+        except subprocess.CalledProcessError:
+            pass
 
         return difference

{diffoscope-288 → diffoscope-290}/diffoscope/comparators/openssl.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,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
+import logging
 import plistlib
 
 from diffoscope.tools import tool_required
@@ -24,6 +25,8 @@ from diffoscope.difference import Difference
 from .utils.file import File
 from .utils.command import Command, our_check_output
 
+logger = logging.getLogger(__name__)
+
 
 class OpenSSLPKCS7(Command):
     @tool_required("openssl")
@@ -53,18 +56,25 @@ class MobileProvisionFile(File):
     @staticmethod
     @tool_required("openssl")
     def _get_structured_profile_text(path):
-        openssl_output = our_check_output(
-            [
-                "openssl",
-                "smime",
-                "-inform",
-                "der",
-                "-verify",
-                "-noverify",
-                "-in",
-                path,
-            ]
-        )
+        try:
+            openssl_output = our_check_output(
+                [
+                    "openssl",
+                    "smime",
+                    "-inform",
+                    "der",
+                    "-verify",
+                    "-noverify",
+                    "-in",
+                    path,
+                ]
+            )
+        except subprocess.CalledProcessError as exc:
+            logger.warning(
+                "Failed to execute openssl to analayse Xcode file", exc
+            )
+            return "[Could not parse output]"
+
         return plistlib.dumps(plistlib.loads(openssl_output), sort_keys=True)
 
     def compare_details(self, other, source=None):

{diffoscope-288 → diffoscope-290/diffoscope.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: diffoscope
-Version: 288
+Version: 290
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers
@@ -40,6 +40,18 @@ Requires-Dist: python-debian; extra == "comparators"
 Requires-Dist: pyxattr; extra == "comparators"
 Requires-Dist: rpm-python; extra == "comparators"
 Requires-Dist: tlsh; extra == "comparators"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 diffoscope
 ==========

{diffoscope-288 → diffoscope-290}/setup.py

@@ -5,7 +5,6 @@ import json
 import sys
 
 from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
 
 
 if sys.version_info < (3, 7):
@@ -13,26 +12,6 @@ if sys.version_info < (3, 7):
     sys.exit(1)
 
 
-class PyTest(TestCommand):
-    user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        super().initialize_options()
-        self.pytest_args = []
-
-    def finalize_options(self):
-        super().finalize_options()
-        if self.pytest_args:
-            self.pytest_args = [self.pytest_args]
-
-    def run_tests(self):
-        # Inline import, otherwise the eggs aren't loaded
-        import pytest
-
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
-
 # Load extras_require dict from external JSON file. This allows it to be easily
 # shared by the debian/tests/generate-recommends.py script.
 with open("extras_require.json") as f:
@@ -50,8 +29,6 @@ setup(
     url="https://diffoscope.org/",
     packages=find_packages(exclude=["tests", "tests.*"]),
     package_data={"diffoscope": ["scripts/*"]},
-    tests_require=["pytest"],
-    cmdclass={"test": PyTest},
     entry_points={
         "console_scripts": ["diffoscope=diffoscope.main:main"],
     },