Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1504171664184060"
MIME-Version: 1.0
Date: Thu, 31 Aug 2017 09:27:44 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/py-xlrd
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20170831092744.74A7BFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1504171664184060
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

Module Name:	pkgsrc
Committed By:	adam
Date:		Thu Aug 31 09:27:44 UTC 2017

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

Log Message:
1.1.0:
Fix for parsing of merged cells containing a single cell reference in xlsx files.
Fix for “invalid literal for int() with base 10: ‘true’” when reading some xlsx files.
Make xldate_as_datetime available to import direct from xlrd.
Build universal wheels.
Sphinx documentation.
Document the problem with XML vulnerabilities in xlsx files and mitigation measures.
Fix NameError on has_defaults is not defined.
Some whitespace and code style tweaks.
Make example in README compatible with both Python 2 and 3.
Add default value for cells containing errors that causeed parsing of some xlsx files to fail.
Add Python 3.6 to the list of supported Python versions, drop 3.3 and 2.6.
Use generator expressions to avoid unnecessary lists in memory.
Document unicode encoding used in Excel files from Excel 97 onwards.
Report hyperlink errors in R1C1 syntax.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/py-xlrd/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-xlrd/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/py-xlrd/distinfo

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


--_----------=_1504171664184060
Content-Disposition: inline
Content-Length: 3573
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/py-xlrd/Makefile
diff -u pkgsrc/textproc/py-xlrd/Makefile:1.11 pkgsrc/textproc/py-xlrd/Makefile:1.12
--- pkgsrc/textproc/py-xlrd/Makefile:1.11	Wed Jun  8 17:43:41 2016
+++ pkgsrc/textproc/py-xlrd/Makefile	Thu Aug 31 09:27:44 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/08/31 09:27:44 adam Exp $
 
-DISTNAME=	xlrd-0.9.3
+DISTNAME=	xlrd-1.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=x/xlrd/}
@@ -10,9 +10,10 @@ HOMEPAGE=	http://www.lexicon.net/sjmachi
 COMMENT=	Python library to extract data from Microsoft Excel spreadsheet files
 LICENSE=	modified-bsd
 
-USE_LANGUAGES=		#none
+USE_LANGUAGES=		# none
 
-PYTHON_SELF_CONFLICT=	yes
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && ${MV} runxlrd.py runxlrd${PYVERSSUFFIX}.py || ${TRUE}
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-xlrd/PLIST
diff -u pkgsrc/textproc/py-xlrd/PLIST:1.7 pkgsrc/textproc/py-xlrd/PLIST:1.8
--- pkgsrc/textproc/py-xlrd/PLIST:1.7	Fri Aug  8 13:15:32 2014
+++ pkgsrc/textproc/py-xlrd/PLIST	Thu Aug 31 09:27:44 2017
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2014/08/08 13:15:32 obache Exp $
-bin/runxlrd.py
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.8 2017/08/31 09:27:44 adam Exp $
+bin/runxlrd${PYVERSSUFFIX}.py
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/xlrd/__init__.py
 ${PYSITELIB}/xlrd/__init__.pyc
 ${PYSITELIB}/xlrd/__init__.pyo
@@ -13,6 +17,10 @@ ${PYSITELIB}/xlrd/book.pyo
 ${PYSITELIB}/xlrd/compdoc.py
 ${PYSITELIB}/xlrd/compdoc.pyc
 ${PYSITELIB}/xlrd/compdoc.pyo
+${PYSITELIB}/xlrd/examples/namesdemo.xls
+${PYSITELIB}/xlrd/examples/xlrdnameAPIdemo.py
+${PYSITELIB}/xlrd/examples/xlrdnameAPIdemo.pyc
+${PYSITELIB}/xlrd/examples/xlrdnameAPIdemo.pyo
 ${PYSITELIB}/xlrd/formatting.py
 ${PYSITELIB}/xlrd/formatting.pyc
 ${PYSITELIB}/xlrd/formatting.pyo
@@ -22,9 +30,6 @@ ${PYSITELIB}/xlrd/formula.pyo
 ${PYSITELIB}/xlrd/info.py
 ${PYSITELIB}/xlrd/info.pyc
 ${PYSITELIB}/xlrd/info.pyo
-${PYSITELIB}/xlrd/licences.py
-${PYSITELIB}/xlrd/licences.pyc
-${PYSITELIB}/xlrd/licences.pyo
 ${PYSITELIB}/xlrd/sheet.py
 ${PYSITELIB}/xlrd/sheet.pyc
 ${PYSITELIB}/xlrd/sheet.pyo

Index: pkgsrc/textproc/py-xlrd/distinfo
diff -u pkgsrc/textproc/py-xlrd/distinfo:1.6 pkgsrc/textproc/py-xlrd/distinfo:1.7
--- pkgsrc/textproc/py-xlrd/distinfo:1.6	Wed Nov  4 02:00:05 2015
+++ pkgsrc/textproc/py-xlrd/distinfo	Thu Aug 31 09:27:44 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 02:00:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/08/31 09:27:44 adam Exp $
 
-SHA1 (xlrd-0.9.3.tar.gz) = 1970c6a0a4ff7582e8c80b5b1efdc725de215113
-RMD160 (xlrd-0.9.3.tar.gz) = 45382a5e8c98ca43f65148a1aba3b47cf7f64e93
-SHA512 (xlrd-0.9.3.tar.gz) = 8b1480b1b0eb40435c33e6494e3f1c960d97a4e5a7f5a30d1b418485a88e4c6d2721501646eb129d9fce0bcd775aee50b866807b26da77b5c2d35d977bb247d0
-Size (xlrd-0.9.3.tar.gz) = 178490 bytes
+SHA1 (xlrd-1.1.0.tar.gz) = cb048309af7710ccb4e3d2c6a0515a52fc18d3f1
+RMD160 (xlrd-1.1.0.tar.gz) = a388fd7831f07f47877f5044ce2d131a36765f7b
+SHA512 (xlrd-1.1.0.tar.gz) = b58f8d2febc0381ebbddac140139a9a216b5abbc25c11dfbf16fee94c87c84916e6710660542e24bb769163792af000947e3e91616142a82a2b532e59093dbfe
+Size (xlrd-1.1.0.tar.gz) = 541397 bytes


--_----------=_1504171664184060--