Wed Nov 24 18:06:01 2010 UTC ()
update to 2.2.1
changes:
-misc fixes and feature additions
-space saving / time improvements
-needs py-cython-0.13


(drochner)
diff -r1.19 -r1.20 pkgsrc/math/py-pytables/Makefile
diff -r1.8 -r1.9 pkgsrc/math/py-pytables/PLIST
diff -r1.8 -r1.9 pkgsrc/math/py-pytables/distinfo
diff -r0 -r1.3 pkgsrc/math/py-pytables/patches/patch-ab

cvs diff -r1.19 -r1.20 pkgsrc/math/py-pytables/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-pytables/Attic/Makefile 2010/07/17 18:13:08 1.19
+++ pkgsrc/math/py-pytables/Attic/Makefile 2010/11/24 18:06:01 1.20
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.19 2010/07/17 18:13:08 joerg Exp $ 1# $NetBSD: Makefile,v 1.20 2010/11/24 18:06:01 drochner Exp $
2# 2#
3 3
4DISTNAME= tables-2.2 4DISTNAME= tables-2.2.1
5PKGNAME= ${PYPKGPREFIX}-pytables-2.2 5PKGNAME= ${PYPKGPREFIX}-pytables-2.2.1
6CATEGORIES= math python 6CATEGORIES= math python
7MASTER_SITES= http://www.pytables.org/download/pytables-2.2/ 7MASTER_SITES= http://www.pytables.org/download/pytables-2.2.1/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.pytables.org/ 10HOMEPAGE= http://www.pytables.org/
11COMMENT= Database package for large amounts of data 11COMMENT= Database package for large amounts of data
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15PYTHON_VERSIONS_ACCEPTED= 26 25 15PYTHON_VERSIONS_ACCEPTED= 26 25
16 16
17PKG_OPTIONS_VAR= PKG_OPTIONS.pytables 17PKG_OPTIONS_VAR= PKG_OPTIONS.pytables
18PKG_SUPPORTED_OPTIONS= lzo 18PKG_SUPPORTED_OPTIONS= lzo
19PKG_SUGGESTED_OPTIONS= 19PKG_SUGGESTED_OPTIONS=
20.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
@@ -32,16 +32,17 @@ post-extract: @@ -32,16 +32,17 @@ post-extract:
32 cd ${WRKSRC}/utils; \ 32 cd ${WRKSRC}/utils; \
33 ${MV} ptdump ptdump${PYVERSSUFFIX}; \ 33 ${MV} ptdump ptdump${PYVERSSUFFIX}; \
34 ${MV} ptrepack ptrepack${PYVERSSUFFIX}; \ 34 ${MV} ptrepack ptrepack${PYVERSSUFFIX}; \
35 ${MV} nctoh5 nctoh5${PYVERSSUFFIX} 35 ${MV} nctoh5 nctoh5${PYVERSSUFFIX}
36 36
37do-test: 37do-test:
38 (cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py) 38 (cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py)
39 39
40.include "../../lang/python/extension.mk" 40.include "../../lang/python/extension.mk"
41.include "../../devel/hdf5/buildlink3.mk" 41.include "../../devel/hdf5/buildlink3.mk"
42.include "../../devel/zlib/buildlink3.mk" 42.include "../../devel/zlib/buildlink3.mk"
43.include "../../archivers/bzip2/buildlink3.mk" 43.include "../../archivers/bzip2/buildlink3.mk"
44.include "../../math/py-numpy/buildlink3.mk" 44.include "../../math/py-numpy/buildlink3.mk"
 45BUILDLINK_API_DEPENDS.pycython+= ${PYPKGPREFIX}-cython>=0.13
45.include "../../devel/py-cython/buildlink3.mk" 46.include "../../devel/py-cython/buildlink3.mk"
46.include "../../math/py-numexpr/buildlink3.mk" 47.include "../../math/py-numexpr/buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"

cvs diff -r1.8 -r1.9 pkgsrc/math/py-pytables/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/math/py-pytables/Attic/PLIST 2010/07/16 12:17:59 1.8
+++ pkgsrc/math/py-pytables/Attic/PLIST 2010/11/24 18:06:01 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2010/07/16 12:17:59 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.9 2010/11/24 18:06:01 drochner Exp $
2bin/nctoh5${PYVERSSUFFIX} 2bin/nctoh5${PYVERSSUFFIX}
3bin/ptdump${PYVERSSUFFIX} 3bin/ptdump${PYVERSSUFFIX}
4bin/ptrepack${PYVERSSUFFIX} 4bin/ptrepack${PYVERSSUFFIX}
5${PYSITELIB}/tables/__init__.py 5${PYSITELIB}/tables/__init__.py
6${PYSITELIB}/tables/__init__.pyc 6${PYSITELIB}/tables/__init__.pyc
7${PYSITELIB}/tables/__init__.pyo 7${PYSITELIB}/tables/__init__.pyo
8${PYSITELIB}/tables/_comp_bzip2.so 8${PYSITELIB}/tables/_comp_bzip2.so
9${PYSITELIB}/tables/_comp_lzo.so 9${PYSITELIB}/tables/_comp_lzo.so
10${PYSITELIB}/tables/_conditions_common.py 10${PYSITELIB}/tables/_conditions_common.py
11${PYSITELIB}/tables/_conditions_common.pyc 11${PYSITELIB}/tables/_conditions_common.pyc
12${PYSITELIB}/tables/_conditions_common.pyo 12${PYSITELIB}/tables/_conditions_common.pyo
13${PYSITELIB}/tables/_parameters_common.py 13${PYSITELIB}/tables/_parameters_common.py
14${PYSITELIB}/tables/_parameters_common.pyc 14${PYSITELIB}/tables/_parameters_common.pyc
@@ -128,26 +128,29 @@ ${PYSITELIB}/tables/nra/tests/test_neste @@ -128,26 +128,29 @@ ${PYSITELIB}/tables/nra/tests/test_neste
128${PYSITELIB}/tables/nra/tests/test_nestedrecords.pyo 128${PYSITELIB}/tables/nra/tests/test_nestedrecords.pyo
129${PYSITELIB}/tables/nra/tests/test_nriterators.py 129${PYSITELIB}/tables/nra/tests/test_nriterators.py
130${PYSITELIB}/tables/nra/tests/test_nriterators.pyc 130${PYSITELIB}/tables/nra/tests/test_nriterators.pyc
131${PYSITELIB}/tables/nra/tests/test_nriterators.pyo 131${PYSITELIB}/tables/nra/tests/test_nriterators.pyo
132${PYSITELIB}/tables/parameters.py 132${PYSITELIB}/tables/parameters.py
133${PYSITELIB}/tables/parameters.pyc 133${PYSITELIB}/tables/parameters.pyc
134${PYSITELIB}/tables/parameters.pyo 134${PYSITELIB}/tables/parameters.pyo
135${PYSITELIB}/tables/path.py 135${PYSITELIB}/tables/path.py
136${PYSITELIB}/tables/path.pyc 136${PYSITELIB}/tables/path.pyc
137${PYSITELIB}/tables/path.pyo 137${PYSITELIB}/tables/path.pyo
138${PYSITELIB}/tables/registry.py 138${PYSITELIB}/tables/registry.py
139${PYSITELIB}/tables/registry.pyc 139${PYSITELIB}/tables/registry.pyc
140${PYSITELIB}/tables/registry.pyo 140${PYSITELIB}/tables/registry.pyo
 141${PYSITELIB}/tables/req_versions.py
 142${PYSITELIB}/tables/req_versions.pyc
 143${PYSITELIB}/tables/req_versions.pyo
141${PYSITELIB}/tables/scripts/__init__.py 144${PYSITELIB}/tables/scripts/__init__.py
142${PYSITELIB}/tables/scripts/__init__.pyc 145${PYSITELIB}/tables/scripts/__init__.pyc
143${PYSITELIB}/tables/scripts/__init__.pyo 146${PYSITELIB}/tables/scripts/__init__.pyo
144${PYSITELIB}/tables/scripts/ptdump.py 147${PYSITELIB}/tables/scripts/ptdump.py
145${PYSITELIB}/tables/scripts/ptdump.pyc 148${PYSITELIB}/tables/scripts/ptdump.pyc
146${PYSITELIB}/tables/scripts/ptdump.pyo 149${PYSITELIB}/tables/scripts/ptdump.pyo
147${PYSITELIB}/tables/scripts/ptrepack.py 150${PYSITELIB}/tables/scripts/ptrepack.py
148${PYSITELIB}/tables/scripts/ptrepack.pyc 151${PYSITELIB}/tables/scripts/ptrepack.pyc
149${PYSITELIB}/tables/scripts/ptrepack.pyo 152${PYSITELIB}/tables/scripts/ptrepack.pyo
150${PYSITELIB}/tables/table.py 153${PYSITELIB}/tables/table.py
151${PYSITELIB}/tables/table.pyc 154${PYSITELIB}/tables/table.pyc
152${PYSITELIB}/tables/table.pyo 155${PYSITELIB}/tables/table.pyo
153${PYSITELIB}/tables/tableExtension.so 156${PYSITELIB}/tables/tableExtension.so

cvs diff -r1.8 -r1.9 pkgsrc/math/py-pytables/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/math/py-pytables/Attic/distinfo 2010/07/16 12:17:59 1.8
+++ pkgsrc/math/py-pytables/Attic/distinfo 2010/11/24 18:06:01 1.9
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.8 2010/07/16 12:17:59 drochner Exp $ 1$NetBSD: distinfo,v 1.9 2010/11/24 18:06:01 drochner Exp $
2 2
3SHA1 (tables-2.2.tar.gz) = 1a1c3e01b99fb264ae5fce1fa2950c25e6dcb516 3SHA1 (tables-2.2.1.tar.gz) = 2c6385365be19fdf8f81e8fd862bedfcf4fe2ba5
4RMD160 (tables-2.2.tar.gz) = 6a15629c6d08131589e1825d1a237f2d5c887aab 4RMD160 (tables-2.2.1.tar.gz) = 1d9ab1f836fcccccdad8eee7603a1056c2c27716
5Size (tables-2.2.tar.gz) = 4700399 bytes 5Size (tables-2.2.1.tar.gz) = 4985175 bytes
6SHA1 (patch-aa) = 8d89466c9fc4df63dd39a3fe2bd3e9f8ac7b45c8 6SHA1 (patch-aa) = 8d89466c9fc4df63dd39a3fe2bd3e9f8ac7b45c8
 7SHA1 (patch-ab) = 4bae646f86c7cf0e96b143fa09fae8c6e57508a9

File Added: pkgsrc/math/py-pytables/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.3 2010/11/24 18:06:01 drochner Exp $

avoid use of a rendundant Python-2.6 builtin for compatibility

--- tables/tests/test_basics.py.orig	2010-11-05 09:27:14.000000000 +0000
+++ tables/tests/test_basics.py
@@ -2243,7 +2243,7 @@ def _worker(fn, qout = None):
     rows = fp.root.table.where('(f0 < 10)')
     if common.verbose:
         print "Got the iterator, about to iterate"
-    row = next(rows)
+    row = rows.next()
     if common.verbose:
         print "Succeeded in one iteration\n"
     fp.close()