commit: 98897d61dd36cf85381d4692c9eeeff3977aa58b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jul 25 06:55:50 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jul 25 08:41:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98897d61
dev-python/h5py: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/h5py/Manifest | 2 - dev-python/h5py/files/h5py-2.10.0-tests.patch | 32 ---------- dev-python/h5py/files/h5py-3.2.1-i686-types.patch | 55 ----------------- dev-python/h5py/h5py-2.10.0-r1.ebuild | 70 ---------------------- dev-python/h5py/h5py-3.2.1.ebuild | 72 ----------------------- 5 files changed, 231 deletions(-) diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest index 6a82160a728..e7df49824b7 100644 --- a/dev-python/h5py/Manifest +++ b/dev-python/h5py/Manifest @@ -1,3 +1 @@ -DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d -DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284 DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae diff --git a/dev-python/h5py/files/h5py-2.10.0-tests.patch b/dev-python/h5py/files/h5py-2.10.0-tests.patch deleted file mode 100644 index 9f810ed46f0..00000000000 --- a/dev-python/h5py/files/h5py-2.10.0-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -These tests fail as confirmed by upstream. - -Reference: https://github.com/h5py/h5py/issues/1291 -Reference: https://github.com/gentoo/gentoo/pull/14343 - -diff --git a/h5py/tests/test_file2.py b/h5py/tests/test_file2.py -index 0fbf2d5..a7a28bb 100644 ---- a/h5py/tests/test_file2.py -+++ b/h5py/tests/test_file2.py -@@ -207,22 +207,6 @@ class TestFileObj(TestCase): - f.create_dataset('test', data=list(range(12))) - self.assertRaises(Exception, list, f['test']) - -- def test_exception_write(self): -- -- class BrokenBytesIO(io.BytesIO): -- def write(self, b): -- raise Exception('I am broken') -- -- f = h5py.File(BrokenBytesIO(), 'w') -- self.assertRaises(Exception, f.create_dataset, 'test', -- data=list(range(12))) -- self.assertRaises(Exception, f.close) -- -- def test_exception_close(self): -- fileobj = io.BytesIO() -- f = h5py.File(fileobj, 'w') -- fileobj.close() -- self.assertRaises(Exception, f.close) - - def test_method_vanish(self): - fileobj = io.BytesIO() diff --git a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch b/dev-python/h5py/files/h5py-3.2.1-i686-types.patch deleted file mode 100644 index 80bbb112e7b..00000000000 --- a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 76c9c8c4049943c490556fa888cf7743d1a677e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Mon, 12 Apr 2021 11:48:16 +0200 -Subject: [PATCH] TST: Skip problematic datatypes based on their length - -Filter datatypes for tests based on their length rather than keeping -a list of illegal platform+type combinations. This is more robust -than the previous solution and fixes the test failures with new numpy -versions (1.19.5 is the oldest I have tested) that declare 'float96' -and 'complex192' on i686 rather than 'float128' and 'complex256'. - -This fixes the following test failure: - - E AttributeError: module 'numpy' has no attribute 'float128' - -plus, later on (again): - - E TypeError: Illegal length 24 for complex dtype ---- - h5py/tests/test_dtype.py | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/h5py/tests/test_dtype.py b/h5py/tests/test_dtype.py -index c5fac97e..ec4eda21 100644 ---- a/h5py/tests/test_dtype.py -+++ b/h5py/tests/test_dtype.py -@@ -13,8 +13,6 @@ except ImportError: - - from .common import ut, TestCase - --UNSUPPORTED_LONG_DOUBLE = ('i386', 'i486', 'i586', 'i686', 'ppc64le') -- - - class TestVlen(TestCase): - -@@ -289,13 +287,9 @@ class TestOffsets(TestCase): - if (np.issubdtype(f, np.floating) or - np.issubdtype(f, np.complexfloating))) - -- if platform.machine() in UNSUPPORTED_LONG_DOUBLE: -- dtype_dset_map = {str(j): d -- for j, d in enumerate(dtypes) -- if d not in (np.float128, np.complex256)} -- else: -- dtype_dset_map = {str(j): d -- for j, d in enumerate(dtypes)} -+ dtype_dset_map = {str(j): d -+ for j, d in enumerate(dtypes) -+ if d().nbytes in [4, 8, 16, 32]} - - fname = self.mktemp() - --- -2.31.1 - diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild deleted file mode 100644 index 1a732839476..00000000000 --- a/dev-python/h5py/h5py-2.10.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Simple Python interface to HDF5 files" -HOMEPAGE="https://www.h5py.org"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -# disable mpi until mpi4py gets python3_8 -#IUSE="examples mpi" -IUSE="examples" - -#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)] -RDEPEND=" - sci-libs/hdf5:=[hl(+)] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" - -BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]" -# mpi? ( virtual/mpi ) - -DEPEND=" - ${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}] - doc? ( dev-python/alabaster[${PYTHON_USEDEP}] ) - test? ( - dev-python/QtPy[testlib,${PYTHON_USEDEP}] - dev-python/cached-property[${PYTHON_USEDEP}] - )" -# mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) - -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) -DOCS=( README.rst AUTHORS ANN.rst ) - -distutils_enable_tests setup.py -distutils_enable_sphinx docs --no-autodoc - -#pkg_setup() { -# use mpi && export CC=mpicc -#} - -python_prepare_all() { - append-cflags -fno-strict-aliasing - distutils-r1_python_prepare_all -} - -python_configure() { -# esetup.py configure $(usex mpi --mpi '') - esetup.py configure -} - -python_test() { - esetup.py test || die "Tests fail with ${EPYTHON}" - # tests generate .pytest_cache which should not be installed - rm -r "${BUILD_DIR}/lib/.pytest_cache" || die -} - -python_install_all() { - use examples && dodoc -r examples - - distutils-r1_python_install_all -} diff --git a/dev-python/h5py/h5py-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild deleted file mode 100644 index a658b288acf..00000000000 --- a/dev-python/h5py/h5py-3.2.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Simple Python interface to HDF5 files" -HOMEPAGE="https://www.h5py.org"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -# disable mpi until mpi4py gets python3_8 -#IUSE="examples mpi" -IUSE="examples" - -#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)] -DEPEND="sci-libs/hdf5:=[hl(+)]" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/cached-property[${PYTHON_USEDEP}] - ' python3_7) - dev-python/numpy[${PYTHON_USEDEP}]" - -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pkgconfig[${PYTHON_USEDEP}] - test? ( - dev-python/QtPy[testlib,${PYTHON_USEDEP}] - dev-python/cached-property[${PYTHON_USEDEP}] - )" -# mpi? ( virtual/mpi ) -# mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - dev-python/alabaster - -#pkg_setup() { -# use mpi && export CC=mpicc -#} - -PATCHES=( - "${FILESDIR}"/h5py-3.2.1-i686-types.patch -) - -python_prepare_all() { - # avoid pytest-mpi dep, we do not use mpi anyway - sed -i -e 's:pytest-mpi::' pytest.ini || die - distutils-r1_python_prepare_all - - export H5PY_SETUP_REQUIRES=0 -} - -python_test() { - cd "${BUILD_DIR}/lib" || die - pytest -vv -m "not mpi" || - die "Tests failed with ${EPYTHON}" - # tests generate .pytest_cache which should not be installed - rm -r .pytest_cache || die -} - -python_install_all() { - use examples && dodoc -r examples - - distutils-r1_python_install_all -}
