summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2018-11-23 11:42:17 +0000
committeradam <adam@pkgsrc.org>2018-11-23 11:42:17 +0000
commit43bc1d16f433efbe1ba97fd08ed308b1475b5b69 (patch)
treec9fce3d5e160af135c32e2a7d372f9b5fcc08b0c /textproc
parentabf15b350ef96208f747657d813d54f27a840913 (diff)
downloadpkgsrc-43bc1d16f433efbe1ba97fd08ed308b1475b5b69.tar.gz
py-openpyxl: updated to 2.5.11
2.5.11: * Improved handling of missing rows * Add support for defined names to tokeniser
Diffstat (limited to 'textproc')
-rw-r--r--textproc/py-openpyxl/Makefile9
-rw-r--r--textproc/py-openpyxl/distinfo11
-rw-r--r--textproc/py-openpyxl/patches/patch-setup.py15
3 files changed, 23 insertions, 12 deletions
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index 4286d4061a6..b5f5963d076 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2018/11/14 09:09:47 adam Exp $
+# $NetBSD: Makefile,v 1.18 2018/11/23 11:42:17 adam Exp $
-DISTNAME= openpyxl-2.5.10
+DISTNAME= openpyxl-2.5.11
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_PYPI:=o/openpyxl/}
@@ -15,10 +15,5 @@ DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
USE_LANGUAGES= # none
-SUBST_CLASSES+= requires
-SUBST_STAGE.requires= post-install
-SUBST_FILES.requires= ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}/requires.txt
-SUBST_SED.requires= -e '/et_xmlfile/d'
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-openpyxl/distinfo b/textproc/py-openpyxl/distinfo
index ffbb4c1ec0e..c844ff71dae 100644
--- a/textproc/py-openpyxl/distinfo
+++ b/textproc/py-openpyxl/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2018/11/14 09:09:47 adam Exp $
+$NetBSD: distinfo,v 1.16 2018/11/23 11:42:17 adam Exp $
-SHA1 (openpyxl-2.5.10.tar.gz) = e0487d06a9a3aea9c181f701a9fe40e56cfae4c5
-RMD160 (openpyxl-2.5.10.tar.gz) = 4e34435957d2d3ba205e8ca048602f2d4b5e9752
-SHA512 (openpyxl-2.5.10.tar.gz) = 51313d0c8e9342dcc843c2928328024b151f29f361a98270c59e04f6420c1f5e5bd80969598cae96ddfdf3c039013750643b831f04378ad60aa943d153c5b121
-Size (openpyxl-2.5.10.tar.gz) = 170754 bytes
+SHA1 (openpyxl-2.5.11.tar.gz) = bf6a967670437ab420cd6c113b14ca7f5a98c8a3
+RMD160 (openpyxl-2.5.11.tar.gz) = 1188816637ddaa78c4e9173e26e6b7930160c1a0
+SHA512 (openpyxl-2.5.11.tar.gz) = 32c84b3965a34c72a6e3c3e142a38167642e8fef064c23b0cbf1db321d341b3666ee978cb254d8e71407078b3b5c3f6375405e9c9c27058fe22f4d369321e525
+Size (openpyxl-2.5.11.tar.gz) = 173005 bytes
+SHA1 (patch-setup.py) = 4066e01579626843e42b2e0d7ec4c3a0e9177f7a
diff --git a/textproc/py-openpyxl/patches/patch-setup.py b/textproc/py-openpyxl/patches/patch-setup.py
new file mode 100644
index 00000000000..527657f8427
--- /dev/null
+++ b/textproc/py-openpyxl/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2018/11/23 11:42:17 adam Exp $
+
+Prefer lxml to et_xmlfile.
+
+--- setup.py.orig 2018-11-23 11:39:16.000000000 +0000
++++ setup.py
+@@ -59,7 +59,7 @@ setup(
+ license=__license__,
+ python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+ install_requires=[
+- 'jdcal', 'et_xmlfile',
++ 'jdcal', 'lxml',
+ ],
+ project_urls={
+ 'Documentation': 'https://openpyxl.readthedocs.io/en/stable/',