py-diffoscope: update to 253. Changes:

253:
- Improve DOS/MBR extraction by adding support for 7z.
  (Closes: reproducible-builds/diffoscope#333)
- Process objdump symbol comment filter inputs as the Python "bytes" type
  (and not str). (Closes: reproducible-builds/diffoscope#358)
- Add a missing RequiredToolNotFound import.
- Update copyright years.

252:
- As UI/UX improvement, try and avoid printing an extended traceback if
  diffoscope runs out of memory. This may not always be possible to detect.
- Mark diffoscope as stable in setup.py (for PyPI.org). Whatever diffoscope
  is, at least, not "alpha" anymore.

251:
- If the equivalent of `file -i` returns text/plain, fallback to comparing
  this file as a text file. This especially helps when file(1) miscategorises
  text files as some esoteric type. (Closes: Debian:#1053668)
- Update copyright years.

250:
- Fix compatibility with file 5.45. (Closes: reproducible-builds/diffoscope#351)
- Add external tool references for GNU Guix (for html2text and ttx).

249:
- Add specialize_as() method, and use it to speed up .smali comparison in
  APKs. (Closes: reproducible-builds/diffoscope!108)
- Add documentation for the new specialize_as, and expand the documentation
  of `specialize` too. (Re: reproducible-builds/diffoscope!108)
- Update copyright years.
- Correct typos in diffoscope/presenters/utils.py.

248:
- Merge Docker "RUN" commands into single layer.

247:
- Fix compataibility with file(1) version 5.45.
- Use assert_diff in test_uimage and test_cpio.
- xb-tool has moved in Debian bookworm.

246:
- Add support for LLVM 16.

245:
- Don't include file size in image metadata; it is, at best, distracting and
  it is already in the directory metadata.
- Move to using assert_diff in ICO and JPEG tests.
- Update copyright years.

244:
- Address compatibility with python-libarchive-c version 5.
  (Closes: reproducible-builds/diffoscope#344)
- Testsuite changes:
  - Mark that test_dex::test_javap_14_differences requires procyon.
  - Fix "test skipped" textual reason generation in the case of a required
    version being outside of the required range.
  - Temporarily mark some Android-related as XFAIL due to Debian bugs
    #1040941 and #1040916.

243:
- Drop Jenkins build reference in README.rst.
- Update FreeBSD package names
- Improve the documentation on to produce that binary blob that in the arsc
  comparator.

242:
- If the binwalk Python module is not available, ensure the user knows they
  may be missing more differences in, for example, concatenated .cpio
  archives.
- Factor out routine to generate a human-readable comments when
  Python modules are missing.

241:
- Add a missing 'raise' statement dropped in 2d95ae41e. Thanks, Mattia!
- document sending out an email upon release

240:
- Update Lintian override info format in debian/source/lintian-overrides.
- Add Lintian overrides for some "very long lines" in test cases.
- Update Lintian overrides for tests being tagged source-is-missing or
  prebuilt.
- Add Lintian override for very long lines for debian/tests/control.
- Re-add two Lintian overrides about (well-known) source-is-missing
  instances.
- Drop the use of include_package_data=True in setup.py.

239:
- Fix compatibility with pypdf 3.x, and correctly restore test data.
  (Closes: reproducible-builds/diffoscope#335)
- Rework PDF annotations processing into a separate method.

238:
- autopkgtest: fix tool name in the skippable list.

237:
- autopkgtest: only install aapt and dexdump on architectures where they are
  available. (Closes: #1031297)
- compartors/pdf:
  + Drop backward compatibility assignment.
  + Fix flake warnings, potentially reinstating PyPDF 1.x support (untested).

236:
- Update code to match latest version of Black. (Closes: #1031433)
- Require at least Black version 23.1.0 to run the internal Black tests.
- Update copyright years.

235:
- Update .gitlab-ci.yml to push versioned tags to the container registry.
  (Closes: reproducible-builds/diffoscope!119)
- Fix compatibility with PyPDF2. (Closes: reproducible-builds/diffoscope#331)
- Fix compatibility with ImageMagick 7.1.
  (Closes: reproducible-builds/diffoscope#330)
- Update from PyPDF2 to pypdf. (Closes: #1029741, #1029742)
- Add support for Android resources.arsc files.
  (Closes: reproducible-builds/diffoscope!116)
- Add support for dexdump. (Closes: reproducible-builds/diffoscope#134)
- Improve DexFile's FILE_TYPE_RE and add FILE_TYPE_HEADER_PREFIX, and remove
  "Dalvik dex file" from ApkFile's FILE_TYPE_RE as well.
- Update external tool for isoinfo on guix.
  (Closes: reproducible-builds/diffoscope!124)

234:
- test_text_proper_indentation requires at least file version 5.44.
  (Closes: reproducible-builds/diffoscope#329)

pkgsrc changes:
- Convert to wheel.mk.

sysutils/py-diffoscope/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2023/10/23 06:37:52 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2024/01/15 20:03:39 schmonz Exp $
 
-DISTNAME=	diffoscope-233
+DISTNAME=	diffoscope-253
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/diffoscope/}
 
@@ -24,12 +23,10 @@ USE_TOOLS+=	bzip2:run gtar:run xz:run
 # Only Python 3 is supported.
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-USE_PKG_RESOURCES=	yes
-
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 		${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

sysutils/py-diffoscope/PLIST

@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.9 2022/11/09 22:10:20 khorben Exp $
+@comment $NetBSD: PLIST,v 1.10 2024/01/15 20:03:39 schmonz Exp $
 bin/diffoscope-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/diffoscope/__init__.py
 ${PYSITELIB}/diffoscope/__init__.pyc
 ${PYSITELIB}/diffoscope/__init__.pyo
 ${PYSITELIB}/diffoscope/changes.py
 ${PYSITELIB}/diffoscope/changes.pyc
 ${PYSITELIB}/diffoscope/changes.pyo
+${PYSITELIB}/diffoscope/comparators/7z.py
+${PYSITELIB}/diffoscope/comparators/7z.pyc
+${PYSITELIB}/diffoscope/comparators/7z.pyo
 ${PYSITELIB}/diffoscope/comparators/__init__.py
 ${PYSITELIB}/diffoscope/comparators/__init__.pyc
 ${PYSITELIB}/diffoscope/comparators/__init__.pyo
@@ -24,6 +27,9 @@ ${PYSITELIB}/diffoscope/comparators/apk.pyo
 ${PYSITELIB}/diffoscope/comparators/ar.py
 ${PYSITELIB}/diffoscope/comparators/ar.pyc
 ${PYSITELIB}/diffoscope/comparators/ar.pyo
+${PYSITELIB}/diffoscope/comparators/arsc.py
+${PYSITELIB}/diffoscope/comparators/arsc.pyc
+${PYSITELIB}/diffoscope/comparators/arsc.pyo
 ${PYSITELIB}/diffoscope/comparators/berkeley_db.py
 ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyc
 ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyo

sysutils/py-diffoscope/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2023/01/28 00:50:28 khorben Exp $
+$NetBSD: distinfo,v 1.16 2024/01/15 20:03:39 schmonz Exp $
 
-BLAKE2s (diffoscope-233.tar.gz) = 2bd508c06dce2d84e92ab664d50c17671de1addcf31b8d292f883de58df9300e
-SHA512 (diffoscope-233.tar.gz) = ae750c3aeb3e4fb40f6bd2becdb5d148af0b369cb5dea8083a0c16d2f11b7995b7ef32a42bd1c248f14782cc792daa68e3e7838789ff4bd4c2dbb532940ef480
-Size (diffoscope-233.tar.gz) = 3164944 bytes
+BLAKE2s (diffoscope-253.tar.gz) = 70c291e35c9232ecbef31bfef40e0fa956c15da93b05aab27f496276ce151f3e
+SHA512 (diffoscope-253.tar.gz) = a850618dc09c0dcafdda14c9bcd0e01bcb8684a8c325b41052650aa90801343fd7cb6085f2dc98b6b7529e81b294c73ec02b87deb805d4072075130bad67199b
+Size (diffoscope-253.tar.gz) = 3169582 bytes