* [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/files/, dev-python/h5py/
@ 2015-11-17 9:26 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-11-17 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 3f54a597796ca0ada6dca781c84e83466ca9ce1b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 09:23:23 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 09:26:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f54a597
dev-python/h5py: Backport support for mpi4py-2
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563890
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport | 55 +++++++++++++++++++++++
dev-python/h5py/h5py-2.5.0.ebuild | 4 ++
2 files changed, 59 insertions(+)
diff --git a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
new file mode 100644
index 0000000..06bdb83
--- /dev/null
+++ b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
@@ -0,0 +1,55 @@
+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.5.0.ebuild b/dev-python/h5py/h5py-2.5.0.ebuild
index 5947f06..f7c87dc 100644
--- a/dev-python/h5py/h5py-2.5.0.ebuild
+++ b/dev-python/h5py/h5py-2.5.0.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
)
mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
+PATCHES=(
+ "${FILESDIR}"/${P}-mpi4py2.backport
+)
+
pkg_setup() {
use mpi && export CC=mpicc
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/files/, dev-python/h5py/
@ 2020-01-25 3:53 Benda XU
0 siblings, 0 replies; 5+ messages in thread
From: Benda XU @ 2020-01-25 3:53 UTC (permalink / raw
To: gentoo-commits
commit: d9681e53572f2acdade2520930f4d64c42900e01
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 15 08:41:42 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:51:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9681e53
dev-python/h5py: Version bump 2.10.0
Closes: https://github.com/gentoo/gentoo/pull/14343
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
dev-python/h5py/Manifest | 1 +
dev-python/h5py/files/h5py-2.10.0-tests.patch | 32 ++++++++++++++
dev-python/h5py/h5py-2.10.0.ebuild | 63 +++++++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index c360c86ed4f..8853c4df188 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,3 +1,4 @@
+DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b301de6aa450a46918f69132ab8d8d5a3f9b54095feee436a8aa9e9045c27ca1a120d665d6031c14218f0f5 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4
DIST h5py-2.7.1.tar.gz 264225 BLAKE2B ffb0b52127f6cb9634b5ac3266a36bc0003144d302bdc300fff5f6f33e52b5a12e954cc2ef9fdfe9dfa0eddc810b30ee3f556cab2a31338500db666b87e64ddc SHA512 b702e3875c2767d2fabe66601820c517671fb5fc3321334aba081950b625435a1262554f39187cd1b41c6069e2b3826db6f0b610bfed2abe5db8a4dd8a29ecfd
DIST h5py-2.9.0.tar.gz 287853 BLAKE2B f1e5c985ec1431dca2b14490711ec7f125620e67ee6cecb56306d19cc8fd1d1c33d313f6477e98c4dbb780cc50c3a4ca073cfe69e079187f8f52a301aab60467 SHA512 73b1f59e3e2b3eceebf7b97e49bd8f5199afafd7ef29917af05ff8415c2f2129a5c59db9658944370c9bcf8fc04ab26948ee27fc6fd948a22d19cace1ce8c853
diff --git a/dev-python/h5py/files/h5py-2.10.0-tests.patch b/dev-python/h5py/files/h5py-2.10.0-tests.patch
new file mode 100644
index 00000000000..9f810ed46f0
--- /dev/null
+++ b/dev-python/h5py/files/h5py-2.10.0-tests.patch
@@ -0,0 +1,32 @@
+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/h5py-2.10.0.ebuild b/dev-python/h5py/h5py-2.10.0.ebuild
new file mode 100644
index 00000000000..b9c906c3292
--- /dev/null
+++ b/dev-python/h5py/h5py-2.10.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+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"
+
+IUSE="examples mpi"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="dev-python/pkgconfig
+ mpi? ( virtual/mpi )"
+
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]
+ mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+ doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
+ test? ( dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+ dev-python/cached-property[${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 '')
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/files/, dev-python/h5py/
@ 2021-04-12 10:13 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-04-12 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 61beab47461cbaf2f2467d25eb9808583c34f84a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 12 10:13:17 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 12 10:13:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61beab47
dev-python/h5py: Fix skipping inconvenient types on x86
Closes: https://bugs.gentoo.org/782238
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/h5py/files/h5py-3.2.1-i686-types.patch | 55 +++++++++++++++++++++++
dev-python/h5py/h5py-3.2.1.ebuild | 4 ++
2 files changed, 59 insertions(+)
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
new file mode 100644
index 00000000000..80bbb112e7b
--- /dev/null
+++ b/dev-python/h5py/files/h5py-3.2.1-i686-types.patch
@@ -0,0 +1,55 @@
+From 76c9c8c4049943c490556fa888cf7743d1a677e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@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-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild
index 9ece42a61cf..89ba32dc7da 100644
--- a/dev-python/h5py/h5py-3.2.1.ebuild
+++ b/dev-python/h5py/h5py-3.2.1.ebuild
@@ -45,6 +45,10 @@ distutils_enable_sphinx docs \
# 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/files/, dev-python/h5py/
@ 2023-02-24 4:50 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-02-24 4:50 UTC (permalink / raw
To: gentoo-commits
commit: 33d2a521bd14b0d765b0ea7b8faddbdd12127911
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 04:39:12 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 04:39:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d2a521
dev-python/h5py: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/h5py/Manifest | 1 -
dev-python/h5py/files/h5py-3.7.0-types.patch | 36 --------------
dev-python/h5py/h5py-3.7.0.ebuild | 74 ----------------------------
3 files changed, 111 deletions(-)
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index b460c61ffcd6..a61e1cbff058 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,2 +1 @@
-DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2
DIST h5py-3.8.0.tar.gz 400774 BLAKE2B 2e48991225170fbb728fa55a68aea795db42c7eae605d123a24a59a8730220ddc98e88dfbff60220ce8c6952ca7fc0c3e33d472acae09864a29bfe11d90fcca1 SHA512 13397f66a9fc735e1143eb9e3dd584280e955adf49de467bf56c1a98952903720480ab8d505921b7e22c16453498625ad93421a64e520f15ea3566472849a8fd
diff --git a/dev-python/h5py/files/h5py-3.7.0-types.patch b/dev-python/h5py/files/h5py-3.7.0-types.patch
deleted file mode 100644
index 47058879445f..000000000000
--- a/dev-python/h5py/files/h5py-3.7.0-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 873077a5b132c4294f0ea6af2eb29d61352c6688 Mon Sep 17 00:00:00 2001
-From: Gyeongjae Choi <def6488@gmail.com>
-Date: Fri, 2 Sep 2022 07:54:44 +0000
-Subject: [PATCH] Fix incompatible pointer type
-
----
- h5py/_errors.pxd | 2 +-
- h5py/_errors.pyx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/h5py/_errors.pxd b/h5py/_errors.pxd
-index 13b299e27..e7791a6bd 100644
---- a/h5py/_errors.pxd
-+++ b/h5py/_errors.pxd
-@@ -412,7 +412,7 @@ cdef extern from "hdf5.h":
-
- herr_t H5Eprint(hid_t estack_id, void *stream)
-
-- ctypedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void* client_data)
-+ ctypedef herr_t (*H5E_walk_t)(unsigned int n, const H5E_error_t *err_desc, void* client_data)
- herr_t H5Ewalk(hid_t estack_id, H5E_direction_t direction, H5E_walk_t func, void* client_data)
-
- # --- Functions for managing the HDF5 error callback mechanism ---
-diff --git a/h5py/_errors.pyx b/h5py/_errors.pyx
-index 612052fb2..ca7b1c48c 100644
---- a/h5py/_errors.pyx
-+++ b/h5py/_errors.pyx
-@@ -94,7 +94,7 @@ cdef struct err_data_t:
- H5E_error_t err
- int n
-
--cdef herr_t walk_cb(int n, H5E_error_t *desc, void *e) nogil:
-+cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil:
-
- cdef err_data_t *ee = <err_data_t*>e
-
diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild
deleted file mode 100644
index 4bde6fa3be73..000000000000
--- a/dev-python/h5py/h5py-3.7.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
- https://www.h5py.org/
- https://github.com/h5py/h5py/
- https://pypi.org/project/h5py/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv 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}
- >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
- dev-python/pkgconfig[${PYTHON_USEDEP}]
- test? (
- dev-python/QtPy[testlib,${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
-#}
-
-python_prepare_all() {
- local PATCHES=(
- "${FILESDIR}"/${P}-types.patch
- )
-
- # 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}/install$(python_get_sitedir)" || die
- epytest -m "not mpi"
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/files/, dev-python/h5py/
@ 2023-08-12 16:16 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-08-12 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 1e1aa3d7218f7e7b850893049f6bc704105a1181
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 16:15:23 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 16:15:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1aa3d7
dev-python/h5py: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/h5py/Manifest | 1 -
dev-python/h5py/files/h5py-3.8.0-cython3.patch | 26 ---------
dev-python/h5py/h5py-3.8.0.ebuild | 74 --------------------------
3 files changed, 101 deletions(-)
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index cac65c4a1f7a..438d98fcb61c 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,2 +1 @@
-DIST h5py-3.8.0.tar.gz 400774 BLAKE2B 2e48991225170fbb728fa55a68aea795db42c7eae605d123a24a59a8730220ddc98e88dfbff60220ce8c6952ca7fc0c3e33d472acae09864a29bfe11d90fcca1 SHA512 13397f66a9fc735e1143eb9e3dd584280e955adf49de467bf56c1a98952903720480ab8d505921b7e22c16453498625ad93421a64e520f15ea3566472849a8fd
DIST h5py-3.9.0.tar.gz 402856 BLAKE2B e2c617c492c2fba751fa546292232b78e1cec4bc75fb50a7c59cdb4a34bc927134d4604d3d9b24f880235cfb356636e66907b8026107547905a77ed9732ccc26 SHA512 f87cb36ba874e86b179776031c3345ad83bc7b5eff2f3ee54acb6b0997cc7925c17dc478957103ab6bb07d8aaa8593af1d51c3547021a205e9d01c0e36d833a9
diff --git a/dev-python/h5py/files/h5py-3.8.0-cython3.patch b/dev-python/h5py/files/h5py-3.8.0-cython3.patch
deleted file mode 100644
index 3201a2ea0e6b..000000000000
--- a/dev-python/h5py/files/h5py-3.8.0-cython3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From af48a740070643549e76890fcc88276fe4ee1159 Mon Sep 17 00:00:00 2001
-From: Thomas A Caswell <tcaswell@bnl.gov>
-Date: Mon, 3 Apr 2023 14:55:18 -0400
-Subject: [PATCH] BLD: fix for cython3 compatibility
-
----
- h5py/_errors.pyx | 2 +-
- pyproject.toml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/h5py/_errors.pyx b/h5py/_errors.pyx
-index ca7b1c48..c3bd184e 100644
---- a/h5py/_errors.pyx
-+++ b/h5py/_errors.pyx
-@@ -94,7 +94,7 @@ cdef struct err_data_t:
- H5E_error_t err
- int n
-
--cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil:
-+cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil noexcept:
-
- cdef err_data_t *ee = <err_data_t*>e
-
---
-2.40.1
-
diff --git a/dev-python/h5py/h5py-3.8.0.ebuild b/dev-python/h5py/h5py-3.8.0.ebuild
deleted file mode 100644
index 6af255d496d6..000000000000
--- a/dev-python/h5py/h5py-3.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
- https://www.h5py.org/
- https://github.com/h5py/h5py/
- https://pypi.org/project/h5py/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv 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}
- >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
- dev-python/pkgconfig[${PYTHON_USEDEP}]
- test? (
- dev-python/QtPy[testlib,${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
-#}
-
-python_prepare_all() {
- local PATCHES=(
- "${FILESDIR}/${P}-cython3.patch"
- )
-
- # 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}/install$(python_get_sitedir)" || die
- epytest -m "not mpi"
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-12 16:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-24 4:50 [gentoo-commits] repo/gentoo:master commit in: dev-python/h5py/files/, dev-python/h5py/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-08-12 16:16 Michał Górny
2021-04-12 10:13 Michał Górny
2020-01-25 3:53 Benda XU
2015-11-17 9:26 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox