CVS commit: pkgsrc/textproc/csvkit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 24 10:22:32 UTC 2021

Modified Files:
        pkgsrc/textproc/csvkit: Makefile distinfo
        pkgsrc/textproc/csvkit/patches: patch-setup.py
Added Files:
        pkgsrc/textproc/csvkit/patches: patch-csvkit_convert_xlsx.py

Log Message:
csvkit: fix dependencies, update code for changes in a dependency.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/csvkit/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/csvkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/csvkit/patches/patch-csvkit_convert_xlsx.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/csvkit/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/textproc/csvkit/Makefile
diff -u pkgsrc/textproc/csvkit/Makefile:1.10 pkgsrc/textproc/csvkit/Makefile:1.11
--- pkgsrc/textproc/csvkit/Makefile:1.10        Fri Dec  4 20:45:44 2020
+++ pkgsrc/textproc/csvkit/Makefile     Wed Nov 24 10:22:32 2021
@@ -1,36 +1,26 @@
-# $NetBSD: Makefile,v 1.10 2020/12/04 20:45:44 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/11/24 10:22:32 wiz Exp $
 
-DISTNAME=      0.9.0
-PKGREVISION=   3
-PKGNAME=       csvkit-${DISTNAME}
+DISTNAME=      csvkit-0.9.0
+PKGREVISION=   4
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wireservice/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/wireservice/csvkit
 COMMENT=       Suite of utilities for converting to and working with CSV
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-nose>=1.1.2:../../devel/py-nose
-DEPENDS+=      ${PYPKGPREFIX}-xlrd>=0.9.2:../../textproc/py-xlrd
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.0.7:../../textproc/py-sphinx
 DEPENDS+=      ${PYPKGPREFIX}-dateutil>=2.2:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-sqlalchemy>=0.9.3:../../databases/py-sqlalchemy
-DEPENDS+=      ${PYPKGPREFIX}-sphinx>=1.0.7:../../textproc/py-sphinx
-DEPENDS+=      ${PYPKGPREFIX}-coverage>=1.0.7:../../devel/py-coverage
+DEPENDS+=      ${PYPKGPREFIX}-dbf-[0-9]*:../../databases/py-dbf
 DEPENDS+=      ${PYPKGPREFIX}-openpyxl>=2.0.3:../../textproc/py-openpyxl
-DEPENDS+=      ${PYPKGPREFIX}-jdcal>=0.9.3:../../time/py-jdcal
-DEPENDS+=      ${PYPKGPREFIX}-simplejson>=3.6.3:../../converters/py-simplejson
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.6.1:../../lang/py-six
-#DEPENDS+=     ${PYPKGPREFIX}-tox>=1.3:../../*/py-tox
-
-# csvkit publishes files like "0.9.0.tar.gz"
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
+DEPENDS+=      ${PYPKGPREFIX}-sqlalchemy>=0.9.3:../../databases/py-sqlalchemy
+DEPENDS+=      ${PYPKGPREFIX}-xlrd>=0.9.2:../../textproc/py-xlrd
+TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=3.5.1:../../devel/py-coverage
 
 USE_LANGUAGES= # none
 
-EGG_NAME=      ${PKGNAME_NOREV}
-
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/csvkit/distinfo
diff -u pkgsrc/textproc/csvkit/distinfo:1.5 pkgsrc/textproc/csvkit/distinfo:1.6
--- pkgsrc/textproc/csvkit/distinfo:1.5 Tue Oct 26 11:21:48 2021
+++ pkgsrc/textproc/csvkit/distinfo     Wed Nov 24 10:22:32 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:21:48 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/11/24 10:22:32 wiz Exp $
 
-BLAKE2s (csvkit-0.9.0/0.9.0.tar.gz) = c26f14554b396cd65cc28831d7ea496ad8bcd98f009a7d720025b37cfaf54d37
-SHA512 (csvkit-0.9.0/0.9.0.tar.gz) = f4315a9e6de26d8dcccb127aa1f6b2d0018b84be561797a0d7094b036add5ceb8232d27a4d5e63dffd039524ec96399fa667b3feb40256df82d47be95ff08fbe
-Size (csvkit-0.9.0/0.9.0.tar.gz) = 3928467 bytes
+BLAKE2s (csvkit-0.9.0.tar.gz) = c26f14554b396cd65cc28831d7ea496ad8bcd98f009a7d720025b37cfaf54d37
+SHA512 (csvkit-0.9.0.tar.gz) = f4315a9e6de26d8dcccb127aa1f6b2d0018b84be561797a0d7094b036add5ceb8232d27a4d5e63dffd039524ec96399fa667b3feb40256df82d47be95ff08fbe
+Size (csvkit-0.9.0.tar.gz) = 3928467 bytes
 SHA1 (patch-csvkit_convert_____init____.py) = b2da7ef399cac88c9f4de737aa0b43ee61341ce0
-SHA1 (patch-setup.py) = 41b954a6d9f0bb815930acf12cea5cd487d0e48e
+SHA1 (patch-csvkit_convert_xlsx.py) = ae5e72fa46f8bbf3ed8a594c6181011f0d7035df
+SHA1 (patch-setup.py) = dc7c90a49a6025490744600a6252bfd37a603150

Index: pkgsrc/textproc/csvkit/patches/patch-setup.py
diff -u pkgsrc/textproc/csvkit/patches/patch-setup.py:1.2 pkgsrc/textproc/csvkit/patches/patch-setup.py:1.3
--- pkgsrc/textproc/csvkit/patches/patch-setup.py:1.2   Sat Apr 18 18:27:16 2015
+++ pkgsrc/textproc/csvkit/patches/patch-setup.py       Wed Nov 24 10:22:32 2021
@@ -1,6 +1,7 @@
-$NetBSD: patch-setup.py,v 1.2 2015/04/18 18:27:16 cheusov Exp $
+$NetBSD: patch-setup.py,v 1.3 2021/11/24 10:22:32 wiz Exp $
 
 # Fix too strict requirements
+
 --- setup.py.orig      2014-09-09 00:22:49.000000000 +0000
 +++ setup.py
 @@ -8,7 +8,7 @@ install_requires = [

Added files:

Index: pkgsrc/textproc/csvkit/patches/patch-csvkit_convert_xlsx.py
diff -u /dev/null pkgsrc/textproc/csvkit/patches/patch-csvkit_convert_xlsx.py:1.1
--- /dev/null   Wed Nov 24 10:22:32 2021
+++ pkgsrc/textproc/csvkit/patches/patch-csvkit_convert_xlsx.py Wed Nov 24 10:22:32 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-csvkit_convert_xlsx.py,v 1.1 2021/11/24 10:22:32 wiz Exp $
+
+use_iterators was replaced with read_only
+https://openpyxl.readthedocs.io/en/stable/changes.html?highlight=use_iterators#a1-2016-04-11
+
+--- csvkit/convert/xlsx.py.orig        2014-09-09 00:22:49.000000000 +0000
++++ csvkit/convert/xlsx.py
+@@ -48,7 +48,7 @@ def xlsx2csv(f, output=None, **kwargs):
+ 
+     writer = CSVKitWriter(output)
+ 
+-    book = load_workbook(f, use_iterators=True, data_only=True)
++    book = load_workbook(f, read_only=True, data_only=True)
+ 
+     if 'sheet' in kwargs:
+         sheet = book.get_sheet_by_name(kwargs['sheet'])