CVS commit: pkgsrc/textproc/py-xmldiff

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun 10 21:00:41 UTC 2024

Modified Files:
        pkgsrc/textproc/py-xmldiff: Makefile PLIST distinfo

Log Message:
py-xmldiff: updated to 2.7.0

2.7.0 (2024-05-13)
------------------

- Changed the comparison to make accurate and standard more accurate,
  although fast gets less accurate as a result.

- Changed usage of deprecated `pkg_resources` package to `importlib.metadata`.

- A `use_replace` flag was added to the `XMLFormatter` by Thomas Pfitzinger.
  It changes text replacement from delete and insert tags to a replace tag.
  It's not currently accessaible thtough the CLI, the question is it is better
  to add a new formatter name, or an option to pass in formatter flags.

  - Added option to XMLFormatter to use replace tags
  - in _make_diff_tags after diffing, neighboring delete/insert diffs are joined to a replace tag
  - the deleted text is added as an attribute ("old-text")
  - the inserted text is the element's text


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-xmldiff/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-xmldiff/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-xmldiff/distinfo

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

Modified files:

Index: pkgsrc/textproc/py-xmldiff/Makefile
diff -u pkgsrc/textproc/py-xmldiff/Makefile:1.3 pkgsrc/textproc/py-xmldiff/Makefile:1.4
--- pkgsrc/textproc/py-xmldiff/Makefile:1.3     Mon Jul 10 20:50:06 2023
+++ pkgsrc/textproc/py-xmldiff/Makefile Mon Jun 10 21:00:40 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2023/07/10 20:50:06 adam Exp $
+# $NetBSD: Makefile,v 1.4 2024/06/10 21:00:40 adam Exp $
 
-DISTNAME=      xmldiff-2.6.3
+DISTNAME=      xmldiff-2.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=x/xmldiff/}
@@ -10,12 +10,12 @@ HOMEPAGE=   https://github.com/Shoobx/xmld
 COMMENT=       Creates diffs of XML files
 LICENSE=       mit
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.1.0:../../textproc/py-lxml
 
 USE_LANGUAGES= # none
 
-USE_PKG_RESOURCES=     yes
-
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 post-install:
@@ -24,5 +24,5 @@ post-install:
        ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
 .endfor
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-xmldiff/PLIST
diff -u pkgsrc/textproc/py-xmldiff/PLIST:1.1 pkgsrc/textproc/py-xmldiff/PLIST:1.2
--- pkgsrc/textproc/py-xmldiff/PLIST:1.1        Thu May  4 11:35:13 2023
+++ pkgsrc/textproc/py-xmldiff/PLIST    Mon Jun 10 21:00:40 2024
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2023/05/04 11:35:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/06/10 21:00:40 adam Exp $
 bin/xmldiff-${PYVERSSUFFIX}
 bin/xmlpatch-${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}/${EGG_INFODIR}/zip-safe
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.txt
+${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}/${WHEEL_INFODIR}/zip-safe
 ${PYSITELIB}/xmldiff/__init__.py
 ${PYSITELIB}/xmldiff/__init__.pyc
 ${PYSITELIB}/xmldiff/__init__.pyo

Index: pkgsrc/textproc/py-xmldiff/distinfo
diff -u pkgsrc/textproc/py-xmldiff/distinfo:1.2 pkgsrc/textproc/py-xmldiff/distinfo:1.3
--- pkgsrc/textproc/py-xmldiff/distinfo:1.2     Mon Jul 10 20:50:06 2023
+++ pkgsrc/textproc/py-xmldiff/distinfo Mon Jun 10 21:00:40 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2023/07/10 20:50:06 adam Exp $
+$NetBSD: distinfo,v 1.3 2024/06/10 21:00:40 adam Exp $
 
-BLAKE2s (xmldiff-2.6.3.tar.gz) = acaf0d1f28c56dc3155c779615f77987d290ddb37dd7f532130609a370f8a151
-SHA512 (xmldiff-2.6.3.tar.gz) = ba25b8cc9866c66bc829a82d1f20108c17a09e2f46735763317f7fd6f60c3920ba6d3114454ead1461de4a59c177065291bb71bebb7ee9c4a03f3584452a9e33
-Size (xmldiff-2.6.3.tar.gz) = 86132 bytes
+BLAKE2s (xmldiff-2.7.0.tar.gz) = bcdb9b58e638b30a450efee5061b2a8aaf3f0d2c03a4a2f8cd135c11b7de98d3
+SHA512 (xmldiff-2.7.0.tar.gz) = e285c0e30b4a6f057dd4888599a6bd354b1f1465598eafa7a9ac91d3eb2e8b04e25e466d410dde84d1b6986b647d3759bad322036f3c5c9cd498e8fc291ab888
+Size (xmldiff-2.7.0.tar.gz) = 87596 bytes