commit: 6891e6348ac3444b82d655d97c244d05ef122a8e Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Mon Dec 4 03:23:15 2017 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Mon Dec 4 03:23:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6891e634
dev-python/pytables: drop old version. Reported-by: Orivej Desh <orivej <AT> gmx.fr> Suggested-by: Nick Wallingford <nick <AT> wallingford.cc> Bug: https://bugs.gentoo.org/590936 Package-Manager: Portage-2.3.16, Repoman-2.3.6 dev-python/pytables/Manifest | 3 +- .../pytables/files/pytables-3.1.1-blosc.patch | 16 ----- .../files/pytables-3.1.1-cython-backport.patch | 65 ------------------- .../files/pytables-3.1.1-numpy19-backport.patch | 51 --------------- dev-python/pytables/pytables-3.1.1-r2.ebuild | 75 ---------------------- 5 files changed, 1 insertion(+), 209 deletions(-) diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest index e18340aad94..0e5ff0132fe 100644 --- a/dev-python/pytables/Manifest +++ b/dev-python/pytables/Manifest @@ -1,3 +1,2 @@ -DIST tables-3.1.1.tar.gz 6715786 SHA256 39b9036376f1185599771c19276f13b5b9119d98f9108f58595745ded3fe2da3 SHA512 b5b2052dd81c4748c5e26c1f61f9f92891f48335b0a553f7602ab11c9029dd673d27b91e24cac0da21a81df0c26dbcd9a438214fa58af1ae831c5f04dfa212a6 WHIRLPOOL 86fd6dc9e12503fdbd23013b75f33a41eadbbac0e6dd5ac9a91476d073195077fc6b3d5ad24b1dd4b4c18ae7ed8abc8ea1708262e52240f4c2c3b1153f8c9e91 DIST tables-3.3.0.tar.gz 7004337 SHA256 8383ccf02e041a5d55494a09fc5514140b4653055a2732c981b5fd0f7408822c SHA512 e19445f0f5f2530d49ce55f258931babb7b05df2366637ddbc306323a1f75b7f7dcf91d70a8cc1f41b182d4cdd9c83872873168592bdcce7bd5acae9f3274f36 WHIRLPOOL f270f741d6886775cc730fbcb79de215fbbe2d9b7b2b6efc6b5b3fa7d141046e7c69daad140ad7cc533b439bfae801ea0e1567939dc4258e5c3b6a88f27cd86c -DIST tables-3.4.2.tar.gz 7593471 SHA256 fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b WHIRLPOOL 392e117a3ad372ee91a02ee66994f3c03e67b4ae7473f5761e13215ce33084fc3ac8e9e371ca9b59f374066523bcd3ebbced01c49faaa84d4af75a26811ee35f +DIST tables-3.4.2.tar.gz 7593471 BLAKE2B 1a011a2a910a25d4e7cad68b5a1a267482f5ed958aa824dfba5a6c902200c56253c7d5609cd674dfcb288f6ebf2ecb76f4324e53b852f70d0cfc60d6b222510a SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b diff --git a/dev-python/pytables/files/pytables-3.1.1-blosc.patch b/dev-python/pytables/files/pytables-3.1.1-blosc.patch deleted file mode 100644 index 3a4ba18e5e7..00000000000 --- a/dev-python/pytables/files/pytables-3.1.1-blosc.patch +++ /dev/null @@ -1,16 +0,0 @@ - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 2c0c126..1448eb1 100755 ---- a/setup.py -+++ b/setup.py -@@ -768,7 +768,7 @@ if 'BLOSC' not in optional_libs: - print("Setting compiler flag '-msse2'") - CFLAGS.append("-msse2") - else: -- ADDLIBS += ['blosc'] -+ ADDLIBS += ['blosc', 'blosc_filter'] - - - utilsExtension_libs = LIBS + ADDLIBS diff --git a/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch b/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch deleted file mode 100644 index 7db41d2e1a6..00000000000 --- a/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch +++ /dev/null @@ -1,65 +0,0 @@ - setup.py | 13 +++++++------ - tables/req_versions.py | 2 +- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 0f2f3f7..52cda49 100755 ---- a/setup.py -+++ b/setup.py -@@ -25,6 +25,7 @@ from distutils.core import Extension - from distutils.dep_util import newer - from distutils.util import convert_path - from distutils.ccompiler import new_compiler -+from distutils.version import LooseVersion - - cmdclass = {} - setuptools_kwargs = {} -@@ -106,7 +107,7 @@ def check_import(pkgname, pkgver): - "You need %(pkgname)s %(pkgver)s or greater to run PyTables!" - % {'pkgname': pkgname, 'pkgver': pkgver}) - else: -- if mod.__version__ < pkgver: -+ if mod.__version__ < LooseVersion(pkgver): - exit_with_error( - "You need %(pkgname)s %(pkgver)s or greater to run PyTables!" - % {'pkgname': pkgname, 'pkgver': pkgver}) -@@ -122,21 +123,21 @@ if not has_setuptools: - - # Check if Cython is installed or not (requisite) - try: -+ from Cython import __version__ as cython_version - from Cython.Distutils import build_ext -- from Cython.Compiler.Main import Version - cmdclass['build_ext'] = build_ext - except ImportError: - exit_with_error( - "You need %(pkgname)s %(pkgver)s or greater to compile PyTables!" - % {'pkgname': 'Cython', 'pkgver': min_cython_version}) - --if Version.version < min_cython_version: -+if LooseVersion(cython_version) < min_cython_version: - exit_with_error( -- "At least Cython %s is needed so as to generate extensions!" -- % (min_cython_version)) -+ "You need %(pkgname)s %(pkgver)s or greater to run PyTables!" -+ % {'pkgname': 'Cython', 'pkgver': min_cython_version}) - else: - print("* Found %(pkgname)s %(pkgver)s package installed." -- % {'pkgname': 'Cython', 'pkgver': Version.version}) -+ % {'pkgname': 'Cython', 'pkgver': cython_version}) - - VERSION = open('VERSION').read().strip() - -diff --git a/tables/req_versions.py b/tables/req_versions.py -index 2c9ca01..bd498c3 100644 ---- a/tables/req_versions.py -+++ b/tables/req_versions.py -@@ -17,7 +17,7 @@ - # Minimum recommended versions for mandatory packages - min_numpy_version = '1.4.1' - min_numexpr_version = '2.0.0' --min_cython_version = '0.13' -+min_cython_version = '0.14' - - # The THG team has decided to fix an API inconsistency in the definition - # of the H5Z_class_t structure in version 1.8.3 diff --git a/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch b/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch deleted file mode 100644 index c2f0c2280f0..00000000000 --- a/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 854d5798ca9fd78c00e18710de2e93202f675f3e Mon Sep 17 00:00:00 2001 -From: Antonio Valentino <antonio.valent...@tiscali.it> -Date: Sun, 6 Jul 2014 21:21:39 +0200 -Subject: [PATCH] Fix a compatibility problem with numpy 1.9 (close: #362) - ---- - RELEASE_NOTES.txt | 6 ++++++ - tables/table.py | 6 +++++- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt -index f219eb3..1da20e2 100644 ---- a/RELEASE_NOTES.txt -+++ b/RELEASE_NOTES.txt -@@ -19,6 +19,12 @@ Improvements - requiring strict access alignment. - - -+Bugs fixed -+---------- -+ -+- Fixed compatibitily problems with numpy 1.9 (closes :issue:`362`) -+ -+ - Changes from 3.1.0 to 3.1.1 - =========================== - -diff --git a/tables/table.py b/tables/table.py -index 235f599..ffe8fd6 100644 ---- a/tables/table.py -+++ b/tables/table.py -@@ -3406,6 +3406,10 @@ def _getindex(self): - associated with this column (None if the column is not - indexed).""") - -+ @lazyattr -+ def _itemtype(self): -+ return self.descr._v_dtypes[self.name] -+ - def _getshape(self): - return (self.table.nrows,) + self.descr._v_dtypes[self.name].shape - -@@ -3529,7 +3533,7 @@ def __iter__(self): - table = self.table - itemsize = self.dtype.itemsize - nrowsinbuf = table._v_file.params['IO_BUFFER_SIZE'] // itemsize -- buf = numpy.empty((nrowsinbuf, ), self.dtype) -+ buf = numpy.empty((nrowsinbuf, ), self._itemtype) - max_row = len(self) - for start_row in xrange(0, len(self), nrowsinbuf): - end_row = min(start_row + nrowsinbuf, max_row) diff --git a/dev-python/pytables/pytables-3.1.1-r2.ebuild b/dev-python/pytables/pytables-3.1.1-r2.ebuild deleted file mode 100644 index f22a4f0c61e..00000000000 --- a/dev-python/pytables/pytables-3.1.1-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -MY_PN=tables -MY_P=${MY_PN}-${PV} - -inherit distutils-r1 - -DESCRIPTION="Hierarchical datasets for Python" -HOMEPAGE="http://www.pytables.org/"; -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -LICENSE="BSD" -IUSE="doc examples" - -RDEPEND=" - app-arch/bzip2:0= - dev-libs/c-blosc:0=[hdf5] - dev-libs/lzo:2= - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/numexpr[${PYTHON_USEDEP}] - sci-libs/hdf5:0=" -DEPEND="${RDEPEND} - >=dev-python/cython-0.14[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS ) - -PATCHES=( - "${FILESDIR}"/${P}-cython-backport.patch - "${FILESDIR}"/${P}-numpy19-backport.patch - "${FILESDIR}"/${P}-blosc.patch - ) - -python_prepare_all() { - export HDF5_DIR="${EPREFIX}"/usr - sed \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -e 's:"c-blosc/hdf5/blosc_filter.c"::g' \ - -i setup.py || die - rm -r c-blosc/{blosc,hdf5,internal-complibs} || die - distutils-r1_python_prepare_all -} - -python_compile() { - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile -} - -python_test() { - cd "${BUILD_DIR}"/lib* || die - ${EPYTHON} tables/tests/test_all.py || die -} - -python_install_all() { - if use doc; then - HTML_DOCS=( doc/html/. ) - DOCS+=( doc/scripts ) - fi - distutils-r1_python_install_all - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - doins -r contrib - fi -}
