Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diffoscope for openSUSE:Factory checked in at 2026-05-14 21:43:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.1966 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Thu May 14 21:43:43 2026 rev:52 rq:1353083 version:318 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2026-02-11 18:50:51.446441720 +0100 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.1966/diffoscope.changes 2026-05-14 21:43:49.220724753 +0200 @@ -1,0 +2,17 @@ +Wed May 13 20:22:51 UTC 2026 - Dirk Müller <[email protected]> + +- update to 318: + * Bump Standards-Version to 4.7.4. + * Remove a misleading comment. + * Limit python3-guestfs Build-Dependency to !i386. (Closes: + #1132974) + * Try to fix PYPI_ID_TOKEN debugging. + * Add ppc64el to the list of architectures for python3-guestfs. + * Fix compatibility with LLVM version 22. + * Add some debugging info for PyPI debugging. + * Adjust PGP file detection regex. + * Don't run "test_code_is_black_clean" test in autopkgtests. + * Reformat using Black 26.1.0. + * Update external tool reference for 7z on guix. + +------------------------------------------------------------------- Old: ---- diffoscope-312.tar.bz2 diffoscope-312.tar.bz2.asc New: ---- diffoscope-318.tar.bz2 diffoscope-318.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.9z1UaY/_old 2026-05-14 21:43:49.952754782 +0200 +++ /var/tmp/diff_new_pack.9z1UaY/_new 2026-05-14 21:43:49.952754782 +0200 @@ -17,7 +17,7 @@ Name: diffoscope -Version: 312 +Version: 318 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-312.tar.bz2 -> diffoscope-318.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/debian/changelog new/diffoscope-318/debian/changelog --- old/diffoscope-312/debian/changelog 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/debian/changelog 2026-05-01 22:10:44.000000000 +0200 @@ -1,3 +1,63 @@ +diffoscope (318) unstable; urgency=medium + + [ Chris Lamb ] + * Upload to test PyPI integration. + * Bump Standards-Version to 4.7.4. + + [ Manuel Jacob ] + * Remove a misleading comment. + + -- Chris Lamb <[email protected]> Fri, 01 May 2026 13:10:41 -0700 + +diffoscope (317) unstable; urgency=medium + + [ Chris Lamb ] + * Limit python3-guestfs Build-Dependency to !i386. (Closes: #1132974) + * Try to fix PYPI_ID_TOKEN debugging. + + [ Holger Levsen ] + * Add ppc64el to the list of architectures for python3-guestfs. + + -- Chris Lamb <[email protected]> Fri, 10 Apr 2026 11:38:56 -0400 + +diffoscope (316) unstable; urgency=medium + + [ Jelle van der Waa ] + * Fix compatibility with LLVM version 22. + + [ Chris Lamb ] + * Add some debugging info for PyPI debugging. + + -- Chris Lamb <[email protected]> Thu, 02 Apr 2026 10:31:30 -0700 + +diffoscope (315) unstable; urgency=medium + + [ Jelle van der Waa ] + * Adjust PGP file detection regex. + + -- Chris Lamb <[email protected]> Fri, 20 Mar 2026 10:44:59 -0700 + +diffoscope (314) unstable; urgency=medium + + [ Chris Lamb ] + * Don't run "test_code_is_black_clean" test in autopkgtests. + (Closes: #1130402) + + [ Michael R. Crusoe ] + * Reformat using Black 26.1.0. (Closes: #1130073) + + -- Chris Lamb <[email protected]> Fri, 13 Mar 2026 08:46:58 -0700 + +diffoscope (313) unstable; urgency=medium + + [ Chris Lamb ] + * Don't fail the entire pipeline if deploying to PyPI automatically fails. + + [ Vagrant Cascadian ] + * Update external tool reference for 7z on guix. + + -- Chris Lamb <[email protected]> Fri, 20 Feb 2026 08:53:36 -0800 + diffoscope (312) unstable; urgency=medium [ Jelle van der Waa ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/debian/control new/diffoscope-318/debian/control --- old/diffoscope-312/debian/control 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/debian/control 2026-05-01 22:10:44.000000000 +0200 @@ -70,7 +70,7 @@ python3-defusedxml <!nocheck>, python3-distro <!nocheck>, python3-docutils, - python3-guestfs <!nocheck>, + python3-guestfs [amd64 arm64 loong64 ppc64el riscv64 s390x] <!nocheck>, python3-h5py <!nocheck>, python3-jsondiff <!nocheck>, python3-libarchive-c, @@ -99,7 +99,7 @@ zstd <!nocheck>, Build-Conflicts: graphicsmagick-imagemagick-compat, -Standards-Version: 4.7.3 +Standards-Version: 4.7.4 Homepage: https://diffoscope.org Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git Vcs-Browser: https://salsa.debian.org/reproducible-builds/diffoscope diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/debian/tests/pytest new/diffoscope-318/debian/tests/pytest --- old/diffoscope-312/debian/tests/pytest 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/debian/tests/pytest 2026-05-01 22:10:44.000000000 +0200 @@ -15,6 +15,6 @@ for py in $(py3versions -s); do echo "@@@@@@@@ Running against $py" cp -r tests pyproject.toml "$AUTOPKGTEST_TMP" - (cd "$AUTOPKGTEST_TMP"; "$py" -m pytest -vv -l -r a) + (cd "$AUTOPKGTEST_TMP"; "$py" -m pytest -vv -l -r a -k 'not test_code_is_black_clean') rm -rf "${AUTOPKGTEST_TMP:?}"/* done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/__init__.py new/diffoscope-318/diffoscope/__init__.py --- old/diffoscope-312/diffoscope/__init__.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/__init__.py 2026-05-01 22:10:44.000000000 +0200 @@ -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 = "312" +VERSION = "318" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/__init__.py new/diffoscope-318/diffoscope/comparators/__init__.py --- old/diffoscope-312/diffoscope/comparators/__init__.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/__init__.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..tools import python_module_missing from ..logging import line_eraser - logger = logging.getLogger(__name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/fontconfig.py new/diffoscope-318/diffoscope/comparators/fontconfig.py --- old/diffoscope-312/diffoscope/comparators/fontconfig.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/fontconfig.py 2026-05-01 22:10:44.000000000 +0200 @@ -71,9 +71,7 @@ int checksum = {checksum}; /* checksum of directory state */ int64_t checksum_nano = {checksum_nano}; /* checksum of directory state */ }}; -""".format( - **kwargs - ) +""".format(**kwargs) def read_null_terminated_string(fileobj, offset=None): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/macho.py new/diffoscope-318/diffoscope/comparators/macho.py --- old/diffoscope-312/diffoscope/comparators/macho.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/macho.py 2026-05-01 22:10:44.000000000 +0200 @@ -33,7 +33,6 @@ from .decompile import DecompilableContainer from .utils.command import Command, our_check_output - logger = logging.getLogger(__name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/pgp.py new/diffoscope-318/diffoscope/comparators/pgp.py --- old/diffoscope-312/diffoscope/comparators/pgp.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/pgp.py 2026-05-01 22:10:44.000000000 +0200 @@ -96,7 +96,7 @@ class PgpFile(File): DESCRIPTION = "PGP signed/encrypted messages" - FILE_TYPE_RE = re.compile(r"^PGP message\b") + FILE_TYPE_RE = re.compile(r"^(PGP message|PGP compressed data)\b") CONTAINER_CLASSES = [PGPContainer] FALLBACK_FILE_EXTENSION_SUFFIX = {".pgp", ".asc", ".pub", ".sec", ".gpg"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/rdata.py new/diffoscope-318/diffoscope/comparators/rdata.py --- old/diffoscope-312/diffoscope/comparators/rdata.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/rdata.py 2026-05-01 22:10:44.000000000 +0200 @@ -29,7 +29,6 @@ import logging import binascii - RDS_HEADERS = { binascii.a2b_hex("580a000000020003"), binascii.a2b_hex("580a000000030003"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/utils/compare.py new/diffoscope-318/diffoscope/comparators/utils/compare.py --- old/diffoscope-312/diffoscope/comparators/utils/compare.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/utils/compare.py 2026-05-01 22:10:44.000000000 +0200 @@ -36,7 +36,6 @@ from .command import Command from .specialize import specialize - logger = logging.getLogger(__name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/comparators/vmlinuz.py new/diffoscope-318/diffoscope/comparators/vmlinuz.py --- old/diffoscope-312/diffoscope/comparators/vmlinuz.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/comparators/vmlinuz.py 2026-05-01 22:10:44.000000000 +0200 @@ -25,7 +25,6 @@ from .utils.file import File from .utils.command import Command - logger = logging.getLogger(__name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/config.py new/diffoscope-318/diffoscope/config.py --- old/diffoscope-312/diffoscope/config.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/config.py 2026-05-01 22:10:44.000000000 +0200 @@ -21,7 +21,6 @@ import logging import time - logger = logging.getLogger(__name__) @@ -42,7 +41,6 @@ def reset(self): self.diff_context = 7 - # GNU diff cannot process arbitrary large files :( self.max_diff_input_lines = 2**22 self.max_diff_block_lines_saved = float("inf") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/external_tools.py new/diffoscope-318/diffoscope/external_tools.py --- old/diffoscope-312/diffoscope/external_tools.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/external_tools.py 2026-05-01 22:10:44.000000000 +0200 @@ -23,7 +23,7 @@ """ EXTERNAL_TOOLS = { - "7z": {"debian": "7zip", "guix": "p7zip"}, + "7z": {"debian": "7zip", "guix": "7zip"}, "aapt2": {"debian": "aapt"}, "abootimg": {"debian": "abootimg", "guix": "abootimg"}, "androguard": {"debian": "androguard"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/presenters/icon.py new/diffoscope-318/diffoscope/presenters/icon.py --- old/diffoscope-312/diffoscope/presenters/icon.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/presenters/icon.py 2026-05-01 22:10:44.000000000 +0200 @@ -17,6 +17,4 @@ MyJ7ittwbmj31J+6IrRDp5XTfBt1WJ+WYnZdMB0F3xlUgD5uDVj2Sa+a4SrzH+FeyHHmw17V112w aBOZgP4WczkLZsILar1fpIliMU4XZoK/poE0XHl+N8v6QcGAUbVymnDIZVnzrTXqGzmnhKLxZX/n iyiDjIJgwg4Se1GR/Y8idGPysh6fr0i1i/AHMWHgrwUJgNAAAAAASUVORK5CYII= -""".replace( - "\n", "" -) +""".replace("\n", "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/diffoscope/progress.py new/diffoscope-318/diffoscope/progress.py --- old/diffoscope-312/diffoscope/progress.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/diffoscope/progress.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from .logging import line_eraser from .tools import python_module_missing - logger = logging.getLogger(__name__) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/setup.py new/diffoscope-318/setup.py --- old/diffoscope-312/setup.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/setup.py 2026-05-01 22:10:44.000000000 +0200 @@ -6,7 +6,6 @@ from setuptools import setup, find_packages - if sys.version_info < (3, 7): print("diffoscope requires at least python 3.7", file=sys.stderr) sys.exit(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_archive.py new/diffoscope-318/tests/comparators/test_archive.py --- old/diffoscope-312/tests/comparators/test_archive.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_archive.py 2026-05-01 22:10:44.000000000 +0200 @@ -20,7 +20,6 @@ from ..utils.data import load_fixture - archive1 = load_fixture("archive1.tar") archive2 = load_fixture("archive2.tar") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_arsc.py new/diffoscope-318/tests/comparators/test_arsc.py --- old/diffoscope-312/tests/comparators/test_arsc.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_arsc.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data from ..utils.tools import skip_unless_tools_exist - arsc1 = load_fixture("resources1.arsc") arsc2 = load_fixture("resources2.arsc") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_asar.py new/diffoscope-318/tests/comparators/test_asar.py --- old/diffoscope-312/tests/comparators/test_asar.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_asar.py 2026-05-01 22:10:44.000000000 +0200 @@ -27,7 +27,6 @@ from ..utils.tools import skip_unless_tools_exist from ..utils.nonexisting import assert_non_existing - asar1 = load_fixture("test1.asar") asar2 = load_fixture("test2.asar") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_binary.py new/diffoscope-318/tests/comparators/test_binary.py --- old/diffoscope-312/tests/comparators/test_binary.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_binary.py 2026-05-01 22:10:44.000000000 +0200 @@ -39,7 +39,6 @@ file_version_is_lt, ) - TEST_FILE1_PATH = data("binary1") TEST_FILE2_PATH = data("binary2") TEST_ASCII_PATH = data("text_ascii1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_bzip2.py new/diffoscope-318/tests/comparators/test_bzip2.py --- old/diffoscope-312/tests/comparators/test_bzip2.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_bzip2.py 2026-05-01 22:10:44.000000000 +0200 @@ -28,7 +28,6 @@ from ..utils.tools import skip_unless_tools_exist from ..utils.nonexisting import assert_non_existing - bzip1 = load_fixture("test1.bz2") bzip2 = load_fixture("test2.bz2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_cbfs.py new/diffoscope-318/tests/comparators/test_cbfs.py --- old/diffoscope-312/tests/comparators/test_cbfs.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_cbfs.py 2026-05-01 22:10:44.000000000 +0200 @@ -30,7 +30,6 @@ from ..utils.tools import skip_unless_tools_exist from ..utils.nonexisting import assert_non_existing - TEST_FILE1_PATH = data("text_ascii1") TEST_FILE2_PATH = data("text_ascii2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_deb.py new/diffoscope-318/tests/comparators/test_deb.py --- old/diffoscope-312/tests/comparators/test_deb.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_deb.py 2026-05-01 22:10:44.000000000 +0200 @@ -33,7 +33,6 @@ ) from ..utils.data import load_fixture, get_data - deb1 = load_fixture("test1.deb") deb2 = load_fixture("test2.deb") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_device.py new/diffoscope-318/tests/comparators/test_device.py --- old/diffoscope-312/tests/comparators/test_device.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_device.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data, normalize_zeros from ..utils.tools import skip_unless_tools_exist - text_ascii1 = load_fixture("text_ascii1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_dex.py new/diffoscope-318/tests/comparators/test_dex.py --- old/diffoscope-312/tests/comparators/test_dex.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_dex.py 2026-05-01 22:10:44.000000000 +0200 @@ -33,7 +33,6 @@ from .test_java import javap_version - dex1 = load_fixture("test1.dex") dex2 = load_fixture("test2.dex") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_directory.py new/diffoscope-318/tests/comparators/test_directory.py --- old/diffoscope-312/tests/comparators/test_directory.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_directory.py 2026-05-01 22:10:44.000000000 +0200 @@ -31,7 +31,6 @@ from ..utils.data import data, get_data, assert_diff - TEST_FILE1_PATH = data("text_ascii1") TEST_FILE2_PATH = data("text_ascii2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_elf.py new/diffoscope-318/tests/comparators/test_elf.py --- old/diffoscope-312/tests/comparators/test_elf.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_elf.py 2026-05-01 22:10:44.000000000 +0200 @@ -41,7 +41,6 @@ ) from .test_rlib import llvm_version - obj1 = load_fixture("test1.o") obj2 = load_fixture("test2.o") ignore_readelf_errors1 = load_fixture("test1.debug") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_epub.py new/diffoscope-318/tests/comparators/test_epub.py --- old/diffoscope-312/tests/comparators/test_epub.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_epub.py 2026-05-01 22:10:44.000000000 +0200 @@ -28,7 +28,6 @@ from .test_zip import zipdetails_version - epub1 = load_fixture("test1.epub") epub2 = load_fixture("test2.epub") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_fonts.py new/diffoscope-318/tests/comparators/test_fonts.py --- old/diffoscope-312/tests/comparators/test_fonts.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_fonts.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, assert_diff from ..utils.tools import skip_unless_tools_exist - ttf1 = load_fixture("Samyak-Malayalam1.ttf") ttf2 = load_fixture("Samyak-Malayalam2.ttf") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_gettext.py new/diffoscope-318/tests/comparators/test_gettext.py --- old/diffoscope-312/tests/comparators/test_gettext.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_gettext.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import data, load_fixture, assert_diff from ..utils.tools import skip_unless_tools_exist - mo1 = load_fixture("test1.mo") mo2 = load_fixture("test2.mo") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_git.py new/diffoscope-318/tests/comparators/test_git.py --- old/diffoscope-312/tests/comparators/test_git.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_git.py 2026-05-01 22:10:44.000000000 +0200 @@ -23,7 +23,6 @@ from ..utils.data import assert_diff, load_fixture - git1 = load_fixture("test1.git-index") git2 = load_fixture("test2.git-index") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_gzip.py new/diffoscope-318/tests/comparators/test_gzip.py --- old/diffoscope-312/tests/comparators/test_gzip.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_gzip.py 2026-05-01 22:10:44.000000000 +0200 @@ -32,7 +32,6 @@ from ..utils.data import load_fixture, get_data from ..utils.tools import skip_unless_file_version_is_at_least - gzip1 = load_fixture("test1.gz") gzip2 = load_fixture("test2.gz") gzip3 = load_fixture("debian-bug-876316-control.tar.gz") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_haskell.py new/diffoscope-318/tests/comparators/test_haskell.py --- old/diffoscope-312/tests/comparators/test_haskell.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_haskell.py 2026-05-01 22:10:44.000000000 +0200 @@ -24,7 +24,6 @@ from ..utils.data import get_data, load_fixture, assert_diff from ..utils.tools import skip_unless_tools_exist - haskell1 = load_fixture("test1.hi") haskell2 = load_fixture("test2.hi") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_html.py new/diffoscope-318/tests/comparators/test_html.py --- old/diffoscope-312/tests/comparators/test_html.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_html.py 2026-05-01 22:10:44.000000000 +0200 @@ -23,7 +23,6 @@ from ..utils.data import assert_diff, load_fixture from ..utils.tools import skip_unless_tools_exist - html1 = load_fixture("test1.html") html2 = load_fixture("test2.html") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_icc.py new/diffoscope-318/tests/comparators/test_icc.py --- old/diffoscope-312/tests/comparators/test_icc.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_icc.py 2026-05-01 22:10:44.000000000 +0200 @@ -28,7 +28,6 @@ from ..utils.data import load_fixture, get_data, data from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least - icc1 = load_fixture("test1.icc") icc2 = load_fixture("test2.icc") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_ico_image.py new/diffoscope-318/tests/comparators/test_ico_image.py --- old/diffoscope-312/tests/comparators/test_ico_image.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_ico_image.py 2026-05-01 22:10:44.000000000 +0200 @@ -28,7 +28,6 @@ ) from .test_jpeg_image import imagemagick_version - image1 = load_fixture("test1.ico") image2 = load_fixture("test2.ico") image1_meta = load_fixture("test1_meta.ico") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_ipk.py new/diffoscope-318/tests/comparators/test_ipk.py --- old/diffoscope-312/tests/comparators/test_ipk.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_ipk.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data from ..utils.tools import skip_unless_file_version_is_at_least - ipk1 = load_fixture("base-files_157-r45695_ar71xx.ipk") ipk2 = load_fixture("base-files_157-r45918_ar71xx.ipk") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_iso9660.py new/diffoscope-318/tests/comparators/test_iso9660.py --- old/diffoscope-312/tests/comparators/test_iso9660.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_iso9660.py 2026-05-01 22:10:44.000000000 +0200 @@ -27,7 +27,6 @@ from ..utils.data import load_fixture, get_data from ..utils.tools import skip_unless_tools_exist - iso1 = load_fixture("test1.iso") iso2 = load_fixture("test2.iso") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_java.py new/diffoscope-318/tests/comparators/test_java.py --- old/diffoscope-312/tests/comparators/test_java.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_java.py 2026-05-01 22:10:44.000000000 +0200 @@ -31,7 +31,6 @@ skip_unless_tool_is_between, ) - class1 = load_fixture("Test1.class") class2 = load_fixture("Test2.class") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_javascript.py new/diffoscope-318/tests/comparators/test_javascript.py --- old/diffoscope-312/tests/comparators/test_javascript.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_javascript.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data from ..utils.tools import skip_unless_tools_exist - javascript1 = load_fixture("test1.js") javascript2 = load_fixture("test2.js") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_jpeg_image.py new/diffoscope-318/tests/comparators/test_jpeg_image.py --- old/diffoscope-312/tests/comparators/test_jpeg_image.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_jpeg_image.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, assert_diff from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_between - image1 = load_fixture("test1.jpg") image2 = load_fixture("test2.jpg") image1_meta = load_fixture("test1_meta.jpg") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_json.py new/diffoscope-318/tests/comparators/test_json.py --- old/diffoscope-312/tests/comparators/test_json.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_json.py 2026-05-01 22:10:44.000000000 +0200 @@ -23,7 +23,6 @@ from ..utils.data import load_fixture, assert_diff from ..utils.nonexisting import assert_non_existing - json1 = load_fixture("test1.json") json2 = load_fixture("test2.json") json3a = load_fixture("order1a.json") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_macho.py new/diffoscope-318/tests/comparators/test_macho.py --- old/diffoscope-312/tests/comparators/test_macho.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_macho.py 2026-05-01 22:10:44.000000000 +0200 @@ -29,7 +29,6 @@ from ..utils.tools import skip_unless_tools_exist from .test_rlib import llvm_version - obj1 = load_fixture("test1.macho") obj2 = load_fixture("test2.macho") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_mono.py new/diffoscope-318/tests/comparators/test_mono.py --- old/diffoscope-312/tests/comparators/test_mono.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_mono.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data from ..utils.tools import skip_unless_tools_exist - # these were generated with: # echo 'public class Test { static public void Main () {} }' > test.cs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_openssh_pub_key.py new/diffoscope-318/tests/comparators/test_openssh_pub_key.py --- old/diffoscope-312/tests/comparators/test_openssh_pub_key.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_openssh_pub_key.py 2026-05-01 22:10:44.000000000 +0200 @@ -32,7 +32,6 @@ skip_unless_tool_is_at_most, ) - # Generated by: ssh-keygen -t dsa -C "Test1" opensshpubkey1 = load_fixture("test_openssh_pub_key1.pub") # Generated by: ssh-keygen -t rsa -b 4096 -C "Test2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_pdf.py new/diffoscope-318/tests/comparators/test_pdf.py --- old/diffoscope-312/tests/comparators/test_pdf.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_pdf.py 2026-05-01 22:10:44.000000000 +0200 @@ -29,7 +29,6 @@ ) from ..utils.nonexisting import assert_non_existing - pdf1 = load_fixture("test1.pdf") pdf2 = load_fixture("test2.pdf") pdf3 = load_fixture("test3.pdf") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_png.py new/diffoscope-318/tests/comparators/test_png.py --- old/diffoscope-312/tests/comparators/test_png.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_png.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.tools import skip_unless_tools_exist from ..utils.nonexisting import assert_non_existing - png1 = load_fixture("test1.png") png2 = load_fixture("test2.png") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_ppu.py new/diffoscope-318/tests/comparators/test_ppu.py --- old/diffoscope-312/tests/comparators/test_ppu.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_ppu.py 2026-05-01 22:10:44.000000000 +0200 @@ -27,7 +27,6 @@ from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least from ..utils.nonexisting import assert_non_existing - # These test files were taken from two different builds of the Debian package # fp-units-castle-game-engine (version 5.1.1-2 on amd64) on the Debian # reproducible build infrastructure. The files were originally called diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_ps.py new/diffoscope-318/tests/comparators/test_ps.py --- old/diffoscope-312/tests/comparators/test_ps.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_ps.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least from ..utils.nonexisting import assert_non_existing - ps1 = load_fixture("test1.ps") ps2 = load_fixture("test2.ps") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_rdata.py new/diffoscope-318/tests/comparators/test_rdata.py --- old/diffoscope-312/tests/comparators/test_rdata.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_rdata.py 2026-05-01 22:10:44.000000000 +0200 @@ -28,7 +28,6 @@ from ..utils.data import load_fixture, get_data, assert_diff from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least - rdb1 = load_fixture("test1.rdb") rdb2 = load_fixture("test2.rdb") rdx1 = load_fixture("test1.rdx") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_rlib.py new/diffoscope-318/tests/comparators/test_rlib.py --- old/diffoscope-312/tests/comparators/test_rlib.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_rlib.py 2026-05-01 22:10:44.000000000 +0200 @@ -34,7 +34,6 @@ from ..utils.nonexisting import assert_non_existing from ..utils.versions import Version - rlib1 = load_fixture("test1.rlib") rlib2 = load_fixture("test2.rlib") @@ -92,6 +91,9 @@ if actual_ver >= "21.0": diff_file = "rlib_llvm_dis_expected_diff_21" + if actual_ver >= "22.0": + diff_file = "rlib_llvm_dis_expected_diff_22" + return get_data(diff_file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_sockets.py new/diffoscope-318/tests/comparators/test_sockets.py --- old/diffoscope-312/tests/comparators/test_sockets.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_sockets.py 2026-05-01 22:10:44.000000000 +0200 @@ -93,8 +93,8 @@ def test_sockets(endpoints, expected_results, sampletext): - (names, objects) = zip(*endpoints) - (sock1, sock2, pipe1, pipe2) = objects + names, objects = zip(*endpoints) + sock1, sock2, pipe1, pipe2 = objects ( sock_text_diff, pipe_text_diff, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_sphinx.py new/diffoscope-318/tests/comparators/test_sphinx.py --- old/diffoscope-312/tests/comparators/test_sphinx.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_sphinx.py 2026-05-01 22:10:44.000000000 +0200 @@ -22,7 +22,6 @@ from ..utils.data import assert_diff, load_fixture - inv1 = load_fixture("test1.inv") inv2 = load_fixture("test2.inv") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_sqlite.py new/diffoscope-318/tests/comparators/test_sqlite.py --- old/diffoscope-312/tests/comparators/test_sqlite.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_sqlite.py 2026-05-01 22:10:44.000000000 +0200 @@ -25,7 +25,6 @@ from ..utils.tools import skip_unless_tools_exist from ..utils.nonexisting import assert_non_existing - sqlite3db1 = load_fixture("test1.sqlite3") sqlite3db2 = load_fixture("test2.sqlite3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_tar.py new/diffoscope-318/tests/comparators/test_tar.py --- old/diffoscope-312/tests/comparators/test_tar.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_tar.py 2026-05-01 22:10:44.000000000 +0200 @@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data from ..utils.nonexisting import assert_non_existing - tar1 = load_fixture("test1.tar") tar2 = load_fixture("test2.tar") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_text.py new/diffoscope-318/tests/comparators/test_text.py --- old/diffoscope-312/tests/comparators/test_text.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_text.py 2026-05-01 22:10:44.000000000 +0200 @@ -24,7 +24,6 @@ from ..utils.data import data, load_fixture, assert_diff from ..utils.nonexisting import assert_non_existing - ascii1 = load_fixture("text_ascii1") ascii2 = load_fixture("text_ascii2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_utils.py new/diffoscope-318/tests/comparators/test_utils.py --- old/diffoscope-312/tests/comparators/test_utils.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_utils.py 2026-05-01 22:10:44.000000000 +0200 @@ -32,7 +32,6 @@ skip_unless_module_exists, ) - fuzzy_tar1 = load_fixture("fuzzy1.tar") fuzzy_tar2 = load_fixture("fuzzy2.tar") fuzzy_tar3 = load_fixture("fuzzy3.tar") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_wasm.py new/diffoscope-318/tests/comparators/test_wasm.py --- old/diffoscope-312/tests/comparators/test_wasm.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_wasm.py 2026-05-01 22:10:44.000000000 +0200 @@ -25,7 +25,6 @@ from ..utils.tools import skip_unless_tools_exist from ..utils.nonexisting import assert_non_existing - wasmmodule1 = load_fixture("hello1.wasm") wasmmodule2 = load_fixture("hello2.wasm") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/comparators/test_zip.py new/diffoscope-318/tests/comparators/test_zip.py --- old/diffoscope-312/tests/comparators/test_zip.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/comparators/test_zip.py 2026-05-01 22:10:44.000000000 +0200 @@ -32,7 +32,6 @@ from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least from ..utils.nonexisting import assert_non_existing - zip1 = load_fixture("test1.zip") zip2 = load_fixture("test2.zip") zip3 = load_fixture("test3.zip") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/data/rlib_llvm_dis_expected_diff_22 new/diffoscope-318/tests/data/rlib_llvm_dis_expected_diff_22 --- old/diffoscope-312/tests/data/rlib_llvm_dis_expected_diff_22 1970-01-01 01:00:00.000000000 +0100 +++ new/diffoscope-318/tests/data/rlib_llvm_dis_expected_diff_22 2026-05-01 22:10:44.000000000 +0200 @@ -0,0 +1,36 @@ +@@ -42,32 +42,32 @@ + entry-block: + %out.i.i = alloca ptr, align 8 + %4 = icmp ult i64 %3, 17 + br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i + + then-block-195-.i: ; preds = %entry-block + %5 = tail call ptr @realloc(ptr %0, i64 %2) #2 +- br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit ++ br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit + + _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block + %6 = bitcast ptr %out.i.i to ptr + call void @llvm.lifetime.start.p0(ptr %out.i.i) + store ptr null, ptr %out.i.i, align 8 + %7 = call i32 @posix_memalign(ptr nonnull %out.i.i, i64 %3, i64 %2) #2 + %8 = icmp eq i32 %7, 0 + %9 = load ptr, ptr %out.i.i, align 8 + %sret_slot.0.i.i = select i1 %8, ptr %9, ptr null + call void @llvm.lifetime.end.p0(ptr %out.i.i) + %10 = icmp ule i64 %2, %1 + %11 = select i1 %10, i64 %2, i64 %1 + call void @llvm.memmove.p0.p0.i64(ptr align 1 %sret_slot.0.i.i, ptr align 1 %0, i64 %11, i1 false) #2 + call void @free(ptr %0) #2 +- br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit ++ br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit + +-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i ++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i + %sret_slot.0.i = phi ptr [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ] + ret ptr %sret_slot.0.i + } + + ; Function Attrs: nounwind memory(none) uwtable + define i64 @__rust_reallocate_inplace(ptr readnone captures(none) %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 { + entry-block: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/test_progress.py new/diffoscope-318/tests/test_progress.py --- old/diffoscope-312/tests/test_progress.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/test_progress.py 2026-05-01 22:10:44.000000000 +0200 @@ -27,7 +27,6 @@ from .utils.tools import skip_unless_module_exists from .utils.versions import Version - TEST_TAR1_PATH = os.path.join(os.path.dirname(__file__), "data", "test1.tar") TEST_TAR2_PATH = os.path.join(os.path.dirname(__file__), "data", "test2.tar") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-312/tests/test_source.py new/diffoscope-318/tests/test_source.py --- old/diffoscope-312/tests/test_source.py 2026-02-06 17:53:37.000000000 +0100 +++ new/diffoscope-318/tests/test_source.py 2026-05-01 22:10:44.000000000 +0200 @@ -34,7 +34,7 @@ ] -@skip_unless_tool_is_at_least("black", black_version, "25.1.0") +@skip_unless_tool_is_at_least("black", black_version, "26.1.0") def test_code_is_black_clean(): output = subprocess.check_output( ("black", "--diff", "."), stderr=subprocess.PIPE
