From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-python/h5py/Manifest | 3 +- dev-python/h5py/files/h5py-3.2.1-i686-types.patch | 55 +++++++++++++++++++++++ dev-python/h5py/h5py-3.2.1.ebuild | 6 ++- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 dev-python/h5py/files/h5py-3.2.1-i686-types.patch (limited to 'dev-python/h5py') diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest index 71948645d326..c26f541de329 100644 --- a/dev-python/h5py/Manifest +++ b/dev-python/h5py/Manifest @@ -1,6 +1,7 @@ AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314 +AUX h5py-3.2.1-i686-types.patch 1944 BLAKE2B 55b00cdf84a369fb1bce79fa5acbc82d719f49804d7db47d9fa6f0f17f7fefdf6db7fe653a6d765aaa67eceec5acc010184890294f29a655ab4707664e5798ad SHA512 e100888fcf2f3de1b8a331b20776899100a9d5b8ae65d21a451ac2501af5c63abc78114c620025186e805b64f3828b3be80473ddec6d256d2e6aef9e0f9e1878 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284 EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1 -EBUILD h5py-3.2.1.ebuild 1596 BLAKE2B 39b1af073d49d022b37f9c908c9f8ca09016631360da7f5bdb72f926cfcb456a9563b8649bb5ef68b2622f52d2b1605803f076364f16f0eda1f1d457cfd35dcc SHA512 4618aeb23fe13de94b3ac8ab96a5837084f8a4bc59dba4310e6f6f35aa4a50315d822302584a937b3b8015bc213c556a3aafad590db5c9e3fe2b6b3387309803 +EBUILD h5py-3.2.1.ebuild 1651 BLAKE2B 172d6f7650608ed7bcf16b7a8f81a26bbc97f86415686c17a7596b88a0b5c6fc09af0803c583c6c9596daaad3cac7ec262aac160310f21ad46ac1c2d8e333709 SHA512 32304bb3ef7d3648977f8da73dd3d4212377e8f70aede05b173f1fa42e6758ac44df7e7c37973a4c22ae8642ef79ef8ed80e0afbded03f0cba9a07ad59ce79cf MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52 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?= +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 82dc31d6252c..89ba32dc7dab 100644 --- a/dev-python/h5py/h5py-3.2.1.ebuild +++ b/dev-python/h5py/h5py-3.2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" # disable mpi until mpi4py gets python3_8 #IUSE="examples mpi" IUSE="examples" @@ -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 -- cgit v1.2.3