diff options
Diffstat (limited to 'dev-python/h5py')
| -rw-r--r-- | dev-python/h5py/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport | 55 | ||||
| -rw-r--r-- | dev-python/h5py/h5py-2.4.0.ebuild | 49 | ||||
| -rw-r--r-- | dev-python/h5py/h5py-2.5.0.ebuild | 69 | ||||
| -rw-r--r-- | dev-python/h5py/h5py-2.6.0.ebuild | 64 |
5 files changed, 0 insertions, 240 deletions
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest index 60c28c1c7565..80949b0ea275 100644 --- a/dev-python/h5py/Manifest +++ b/dev-python/h5py/Manifest @@ -1,5 +1,2 @@ DIST h5py-2.3.1.tar.gz 1072766 SHA256 447e55d5893ca285d1185a938548a12f3f7d4af441f1a7740ac28bc3aecf85c1 SHA512 f0da1d2ac855c02fb828444d719a1b23a580adb049335f3e732ace67558a125ac8cd3b3a68ac6bf9d10aa3ab19e4672b814eb28cc8c66910750c62efb655d744 WHIRLPOOL cdd2be028d450d1566776b056550af001dd382082cce5cac9fdb8968071b9f3e9855e2c30bf12bbb800c1313343980f74c2ad3d853318585bdc6134c8af5b35c -DIST h5py-2.4.0.tar.gz 172462 SHA256 faaeadf4b8ca14c054b7568842e0d12690de7d5d68af4ecce5d7b8fc104d8e60 SHA512 b341994899d27ceae81cdf920c44902e7db64cd3e613e2b4bcf19a6d0aea5f2fcc4acc946222a6e5d4b03d787b05e2dd2a2a55df99561f74d6e827a61f85b2c5 WHIRLPOOL 734e848437921f97b2169243993cd111d4f91578bce9980ec9d373113917185f47ea8b1d98732a61bbfc7c7ae8bc1481ddf53a6ee576705352b6d77e22263f27 -DIST h5py-2.5.0.tar.gz 684354 SHA256 9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6 SHA512 4a83f9ae1855a7fad90133b327d426201c8ccfd2e7fbe9f39b2d61a2eee2f3ebe2ea02cf80f3d4e1ad659f8e790c173df8cc99b87d0b7ce63d34aa88cfdc7939 WHIRLPOOL 7d7852d1d2481077a81dbf194e72da10d013c43ede4d2d6e319e1e2be0f70d7495b0964ea7787ddbd145ac774cdabc32c5b7e51fc7c9bfec429d673b12bcc10b -DIST h5py-2.6.0.tar.gz 245539 SHA256 b2afc35430d5e4c3435c996e4f4ea2aba1ea5610e2d2f46c9cae9f785e33c435 SHA512 6f1f8bd9f56f93d950b2601f35b3ad33d648da28970874de98e5d4f4009667e2aab8774d1d570dd16169a1bedec5e58ae60fc29053292b24f9f85d86c5671ac4 WHIRLPOOL 08476fbeba889e8c100150b44c26b7c7e3ad5f6b3662efb7e777153791a0b1a176f4081f0988aacc3769753a407c9e2cf802c950c8068a9f2f4fbd4d1a89b603 DIST h5py-2.7.0.tar.gz 256471 SHA256 79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4 WHIRLPOOL fa38ff5d6c2a97d9eacedb0c8ccbf791ee2edb4ff652bd39a1ab102be5ec849cd45a74dd294f42fd8b2f1d943bbe1b0653afc57f6a44aed0cfc3e0b37cdc589d diff --git a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport deleted file mode 100644 index 06bdb83abab1..000000000000 --- a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport +++ /dev/null @@ -1,55 +0,0 @@ -commit 364a77403199087168786234554f459e7d985063 -Author: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk> -Date: Tue Nov 3 14:18:48 2015 +0000 - - setup: Support building with current mpi4py version - - mpi4py migrated the mpi4py.mpi_c module to mpi4py.libmpi in April 2014. - After the release of v1.3.1 but before v2. Sniff this in setup - configure and import MPI types from the appropriate module in h5p.pyx, - to allow building with MPI on and modern mpi4py versions. - -diff --git a/h5py/h5p.pyx b/h5py/h5p.pyx -index da175dd..8a1cbb0 100644 ---- a/h5py/h5p.pyx -+++ b/h5py/h5p.pyx -@@ -25,7 +25,11 @@ from h5py import _objects - from ._objects import phil, with_phil - - if MPI: -- from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \ -+ if MPI4PY_V2: -+ from mpi4py.libmpi cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \ -+ MPI_Comm_free, MPI_Info_free -+ else: -+ from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \ - MPI_Comm_free, MPI_Info_free - - # Initialization -diff --git a/setup_build.py b/setup_build.py -index ccc0f27..e49a4e8 100644 ---- a/setup_build.py -+++ b/setup_build.py -@@ -162,14 +162,22 @@ class h5py_build_ext(build_ext): - # Rewrite config.pxi file if needed - if not op.isfile(config_file) or config.rebuild_required: - with open(config_file, 'wb') as f: -+ if config.mpi: -+ import mpi4py -+ from distutils.version import StrictVersion -+ v2 = StrictVersion(mpi4py.__version__) > StrictVersion("1.3.1") -+ else: -+ v2 = False - s = """\ - # This file is automatically generated by the h5py setup script. Don't modify. - - DEF MPI = %(mpi)s -+DEF MPI4PY_V2 = %(mpi4py_v2)s - DEF HDF5_VERSION = %(version)s - DEF SWMR_MIN_HDF5_VERSION = (1,9,178) - """ - s %= {'mpi': bool(config.mpi), -+ 'mpi4py_v2': bool(v2), - 'version': tuple(int(x) for x in config.hdf5_version.split('.'))} - s = s.encode('utf-8') - f.write(s) diff --git a/dev-python/h5py/h5py-2.4.0.ebuild b/dev-python/h5py/h5py-2.4.0.ebuild deleted file mode 100644 index 2839e342d800..000000000000 --- a/dev-python/h5py/h5py-2.4.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Simple Python interface to HDF5 files" -HOMEPAGE="http://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" -IUSE="test examples mpi" - -RDEPEND=" - sci-libs/hdf5:=[mpi=,hl(+)] - dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )" - -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 '') -} - -python_test() { - esetup.py test -} - -python_install_all() { - DOCS=( README.rst ANN.rst ) - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/h5py/h5py-2.5.0.ebuild b/dev-python/h5py/h5py-2.5.0.ebuild deleted file mode 100644 index 2f014ae4f40a..000000000000 --- a/dev-python/h5py/h5py-2.5.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Simple Python interface to HDF5 files" -HOMEPAGE="http://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" -IUSE="doc test examples mpi" - -RDEPEND=" - sci-libs/hdf5:=[mpi=,hl(+)] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}] - dev-python/pkgconfig[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/alabaster[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - ) - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${P}-mpi4py2.backport -) - -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 '') -} - -python_compile_all() { - if use doc; then - cd "${S}"/docs || die - sed '/html_theme/s:default:alabaster:g' -i conf.py || die - rm -r _build || die - emake html - fi -} - -python_test() { - esetup.py test -} - -python_install_all() { - DOCS=( README.rst ANN.rst ) - use doc && HTML_DOCS=( docs/_build/html/. ) - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/h5py/h5py-2.6.0.ebuild b/dev-python/h5py/h5py-2.6.0.ebuild deleted file mode 100644 index 5f9126c24ce1..000000000000 --- a/dev-python/h5py/h5py-2.6.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Simple Python interface to HDF5 files" -HOMEPAGE="http://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" -IUSE="doc test examples mpi" - -RDEPEND=" - sci-libs/hdf5:=[mpi=,hl(+)] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}] - dev-python/pkgconfig[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/alabaster[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - ) - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )" - -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 '') -} - -python_compile_all() { - if use doc; then - cd "${S}"/docs || die - sed '/html_theme/s:default:alabaster:g' -i conf.py || die - emake html - fi -} - -python_test() { - esetup.py test -} - -python_install_all() { - DOCS=( README.rst ANN.rst ) - use doc && HTML_DOCS=( docs/_build/html/. ) - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} |