CVS commit: pkgsrc/sysutils/py-diffoscope

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/py-diffoscope
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 14 Apr 2025 07:57:35 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 14 07:57:34 UTC 2025

Modified Files:
        pkgsrc/sysutils/py-diffoscope: Makefile PLIST distinfo

Log Message:
py-diffoscope: updated to 294

294
* Correct longstanding issue where many ">"-based version tests used in
  conditional fixtures were broken due to the lack of a __gt__ method.
* Address a long-hidden issue in the test_versions testsuite where we weren't
  actually testing ">" as it was masked by the tests for equality in the
  testsuite.
* Update copyright years.

293
* Correct import masking issue.

292
* Ignore st_size entry for directories to avoid spurious diffs as this value
  is essentially filesystem dependent.
* Update copyright years.

291
* Make two required adjustments for the new version of the src:file package:
  - file(1) version 5.46 now emits "XHTML document" for .xhtml files, such as
    those found nested within our .epub tests. Therefore, match this string
    when detecting XML files. This was causing an FTBFS due to inconsistent
    indentation in diffoscope's output.
  - Require the new, upcoming, version of file(1) for a quine-related
    testcase after adjusting the expected output. Previous versions of
    file(1) had a duplicated "last modified, last modified" string for some
    Zip archives that has now been removed.
* Add a missing subprocess import.
* Bump Standards-Version to 4.7.2.

290
* Also consider .aar files as APK files for the sake of not falling back to a
  binary diff.
* Ensure all calls to out_check_output in the ELF comparator have the
  potential CalledProcessError exception caught.
* Ensure a potential CalledProcessError is caught in the OpenSSL comparator
  as well.
* Update copyright years.
* Drop deprecated and no longer functional "setup.py test" command.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/py-diffoscope/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/py-diffoscope/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/py-diffoscope/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/py-diffoscope/Makefile
diff -u pkgsrc/sysutils/py-diffoscope/Makefile:1.28 pkgsrc/sysutils/py-diffoscope/Makefile:1.29
--- pkgsrc/sysutils/py-diffoscope/Makefile:1.28 Mon Nov 11 07:28:59 2024
+++ pkgsrc/sysutils/py-diffoscope/Makefile      Mon Apr 14 07:57:34 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2024/11/11 07:28:59 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2025/04/14 07:57:34 adam Exp $
 
-DISTNAME=      diffoscope-268
+DISTNAME=      diffoscope-294
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/diffoscope/}
@@ -10,10 +10,13 @@ HOMEPAGE=   https://diffoscope.org/
 COMMENT=       In-depth comparison of files, archives, and directories
 LICENSE=       gnu-gpl-v3
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-libarchive-c-[0-9]*:../../archivers/py-libarchive-c
 DEPENDS+=      ${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic
+# comparators
+DEPENDS+=      ${PYPKGPREFIX}-defusedxml-[0-9]*:../../textproc/py-defusedxml
 DEPENDS+=      ${PYPKGPREFIX}-tlsh-[0-9]*:../../devel/py-tlsh
+# ???
 DEPENDS+=      colordiff-[0-9]*:../../devel/colordiff
 # for xxd
 DEPENDS+=      vim-[0-9]*:../../editors/vim
@@ -21,11 +24,9 @@ DEPENDS+=    vim-[0-9]*:../../editors/vim
 USE_LANGUAGES= c  # for tests
 USE_TOOLS+=    bzip2:run gtar:run xz:run
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
-               ${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE}
+       ${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/sysutils/py-diffoscope/PLIST
diff -u pkgsrc/sysutils/py-diffoscope/PLIST:1.12 pkgsrc/sysutils/py-diffoscope/PLIST:1.13
--- pkgsrc/sysutils/py-diffoscope/PLIST:1.12    Fri Apr 12 19:28:40 2024
+++ pkgsrc/sysutils/py-diffoscope/PLIST Mon Apr 14 07:57:34 2025
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2024/04/12 19:28:40 nikita Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/04/14 07:57:34 adam Exp $
 bin/diffoscope-${PYVERSSUFFIX}
-${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}/licenses/COPYING
 ${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/diffoscope/__init__.py
 ${PYSITELIB}/diffoscope/__init__.pyc
@@ -12,9 +12,6 @@ ${PYSITELIB}/diffoscope/__init__.pyo
 ${PYSITELIB}/diffoscope/changes.py
 ${PYSITELIB}/diffoscope/changes.pyc
 ${PYSITELIB}/diffoscope/changes.pyo
-${PYSITELIB}/diffoscope/comparators/sevenz.py
-${PYSITELIB}/diffoscope/comparators/sevenz.pyc
-${PYSITELIB}/diffoscope/comparators/sevenz.pyo
 ${PYSITELIB}/diffoscope/comparators/__init__.py
 ${PYSITELIB}/diffoscope/comparators/__init__.pyc
 ${PYSITELIB}/diffoscope/comparators/__init__.pyo
@@ -30,6 +27,9 @@ ${PYSITELIB}/diffoscope/comparators/ar.p
 ${PYSITELIB}/diffoscope/comparators/arsc.py
 ${PYSITELIB}/diffoscope/comparators/arsc.pyc
 ${PYSITELIB}/diffoscope/comparators/arsc.pyo
+${PYSITELIB}/diffoscope/comparators/asar.py
+${PYSITELIB}/diffoscope/comparators/asar.pyc
+${PYSITELIB}/diffoscope/comparators/asar.pyo
 ${PYSITELIB}/diffoscope/comparators/berkeley_db.py
 ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyc
 ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyo
@@ -210,6 +210,9 @@ ${PYSITELIB}/diffoscope/comparators/rpm_
 ${PYSITELIB}/diffoscope/comparators/rust.py
 ${PYSITELIB}/diffoscope/comparators/rust.pyc
 ${PYSITELIB}/diffoscope/comparators/rust.pyo
+${PYSITELIB}/diffoscope/comparators/sevenz.py
+${PYSITELIB}/diffoscope/comparators/sevenz.pyc
+${PYSITELIB}/diffoscope/comparators/sevenz.pyo
 ${PYSITELIB}/diffoscope/comparators/socket_or_fifo.py
 ${PYSITELIB}/diffoscope/comparators/socket_or_fifo.pyc
 ${PYSITELIB}/diffoscope/comparators/socket_or_fifo.pyo
@@ -234,6 +237,9 @@ ${PYSITELIB}/diffoscope/comparators/text
 ${PYSITELIB}/diffoscope/comparators/uimage.py
 ${PYSITELIB}/diffoscope/comparators/uimage.pyc
 ${PYSITELIB}/diffoscope/comparators/uimage.pyo
+${PYSITELIB}/diffoscope/comparators/uki.py
+${PYSITELIB}/diffoscope/comparators/uki.pyc
+${PYSITELIB}/diffoscope/comparators/uki.pyo
 ${PYSITELIB}/diffoscope/comparators/utils/__init__.py
 ${PYSITELIB}/diffoscope/comparators/utils/__init__.pyc
 ${PYSITELIB}/diffoscope/comparators/utils/__init__.pyo

Index: pkgsrc/sysutils/py-diffoscope/distinfo
diff -u pkgsrc/sysutils/py-diffoscope/distinfo:1.21 pkgsrc/sysutils/py-diffoscope/distinfo:1.22
--- pkgsrc/sysutils/py-diffoscope/distinfo:1.21 Fri May 24 21:39:50 2024
+++ pkgsrc/sysutils/py-diffoscope/distinfo      Mon Apr 14 07:57:34 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2024/05/24 21:39:50 nikita Exp $
+$NetBSD: distinfo,v 1.22 2025/04/14 07:57:34 adam Exp $
 
-BLAKE2s (diffoscope-268.tar.gz) = a9fd90cc0fc753dc488ad5463ddc4a4be965a3c98105c11170cc86aeec0bb993
-SHA512 (diffoscope-268.tar.gz) = 1e70780850d8928d27f84e6a10a88ea7d90dcc688614a994b373926a85b2795996f272d0e91985789eb77c7ca92d782fdcf79541207600cbe828d8af9790eba8
-Size (diffoscope-268.tar.gz) = 3286666 bytes
+BLAKE2s (diffoscope-294.tar.gz) = a610cd0e4709360371cb98010452b682a06b629a36e5558bbe46067cbbb005cc
+SHA512 (diffoscope-294.tar.gz) = 28574bcb5bada16b30d11f58b7da99e1001a025748777a348a1f615bf7e4c2038090eac680395bb94048c33dfa89230f5fddf797b0672582f90bbf95c8fa4cfe
+Size (diffoscope-294.tar.gz) = 3180863 bytes

Prev by Date: CVS commit: pkgsrc/sysutils
Next by Date: CVS commit: pkgsrc/sysutils/py-eliot
Previous by Thread: CVS commit: pkgsrc/sysutils
Next by Thread: CVS commit: pkgsrc/sysutils/py-eliot
Indexes:

Home | Main Index | Thread Index | Old Index