python3-h5py: Upgrade to 3.8.0

Drop unused patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-03-01 20:20:42 -08:00
parent ebcce220cc
commit 4e84bef891
3 changed files with 3 additions and 87 deletions

View File

@ -1,53 +0,0 @@
From 5b0b1d0b941ba338d449f9261bdf4cb2b679d048 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 20 Sep 2022 02:53:11 -0700
Subject: [PATCH] fix wrong file driver version
Due to commit [1] applied in hdf5 (1.13.2), import hdf5 failed
|>>> import h5py
|Traceback (most recent call last):
| File "<stdin>", line 1, in <module>
| File "/usr/lib/python3.10/site-packages/h5py/__init__.py", line 56, in <module>
| from . import h5a, h5d, h5ds, h5f, h5fd, h5g, h5r, h5s, h5t, h5p, h5z, h5pl
| File "h5py/h5fd.pyx", line 220, in init h5py.h5fd
|RuntimeError: Wrong file driver version # (wrong file driver version #)
Initial driver version to fix the error
[1] https://github.com/HDFGroup/hdf5/commit/42b767fc67ad1e13735e3cee2077f2e108f9463e
Upstream-Status: Submitted [https://github.com/h5py/h5py/pull/2153]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
h5py/api_types_hdf5.pxd | 1 +
h5py/h5fd.pyx | 1 +
2 files changed, 2 insertions(+)
diff --git a/h5py/api_types_hdf5.pxd b/h5py/api_types_hdf5.pxd
index 6977f1a7..312fdaa0 100644
--- a/h5py/api_types_hdf5.pxd
+++ b/h5py/api_types_hdf5.pxd
@@ -237,6 +237,7 @@ cdef extern from "hdf5.h":
# Class information for each file driver
ctypedef struct H5FD_class_t:
+ unsigned version;
const char *name
haddr_t maxaddr
H5F_close_degree_t fc_degree
diff --git a/h5py/h5fd.pyx b/h5py/h5fd.pyx
index 04aff077..d41953d0 100644
--- a/h5py/h5fd.pyx
+++ b/h5py/h5fd.pyx
@@ -191,6 +191,7 @@ cdef herr_t H5FD_fileobj_flush(H5FD_fileobj_t *f, hid_t dxpl, hbool_t closing) e
cdef H5FD_class_t info
memset(&info, 0, sizeof(info))
+info.version = 0x01
info.name = 'fileobj'
info.maxaddr = libc.stdint.SIZE_MAX - 1
info.fc_degree = H5F_CLOSE_WEAK
--
2.37.1

View File

@ -1,28 +0,0 @@
From b1d4d171fd13624f3d8bb917f716b62494066501 Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Mon, 22 Feb 2021 18:42:43 +0200
Subject: [PATCH] setup.py: Fix numpy version
Fix numpy version to ensure bitbake will find the pip package.
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 4b2890c..42ba21b 100755
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ SETUP_REQUIRES = [
"Cython >=0.29.14; python_version=='3.8'",
"Cython >=0.29.15; python_version>='3.9'",
] + [
- f"numpy =={np_min}; python_version{py_condition}"
+ f"numpy >={np_min}; python_version{py_condition}"
for np_min, py_condition in NUMPY_MIN_VERSIONS
]

View File

@ -4,12 +4,9 @@ SECTION = "devel/python"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c"
SRC_URI[sha256sum] = "3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3"
SRC_URI[sha256sum] = "6fead82f0c4000cf38d53f9c030780d81bfa0220218aee13b90b7701c937d95f"
SRC_URI:append = " \
file://0001-setup_build.py-avoid-absolute-path.patch \
file://0001-fix-wrong-file-driver-version.patch \
"
SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch"
inherit pkgconfig pypi setuptools3
@ -29,4 +26,4 @@ RDEPENDS:${PN} = "python3-numpy \
python3-json \
"
export HDF5_VERSION="1.13.2"
export HDF5_VERSION="1.14.0"