diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-python/h5py/files/h5py-3.2.1-i686-types.patch | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-python/h5py/files/h5py-3.2.1-i686-types.patch')
-rw-r--r-- | dev-python/h5py/files/h5py-3.2.1-i686-types.patch | 55 |
1 files changed, 55 insertions, 0 deletions
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 000000000000..80bbb112e7bd --- /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 + |