From 8679463887b182c233b55d8112534d7d7dcde08b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Oct 2023 17:54:48 +0100 Subject: gentoo auto-resync : 05:10:2023 - 17:54:48 --- dev-python/pytables/Manifest | 6 -- .../pytables/files/pytables-3.8.0-blosc2.patch | 30 -------- .../pytables/files/pytables-3.8.0-cython3.patch | 40 ----------- .../files/pytables-3.8.0-optional-cpuinfo.patch | 69 ------------------ dev-python/pytables/metadata.xml | 27 ------- dev-python/pytables/pytables-3.8.0-r3.ebuild | 84 ---------------------- 6 files changed, 256 deletions(-) delete mode 100644 dev-python/pytables/Manifest delete mode 100644 dev-python/pytables/files/pytables-3.8.0-blosc2.patch delete mode 100644 dev-python/pytables/files/pytables-3.8.0-cython3.patch delete mode 100644 dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch delete mode 100644 dev-python/pytables/metadata.xml delete mode 100644 dev-python/pytables/pytables-3.8.0-r3.ebuild (limited to 'dev-python/pytables') diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest deleted file mode 100644 index 60c2624a565c..000000000000 --- a/dev-python/pytables/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX pytables-3.8.0-blosc2.patch 842 BLAKE2B 1ab97a9b0d5c5e435671c00cb8d5ab77048f9eea493a716846e7d350f902487c2098d43d194c5373ca4297f0d266b723a3d9eb59f69836278adfbb4a75c22820 SHA512 b64944a0916b7da5543b518e16fc70ead6b2f7c0bfdb79bf0e49549067464997b9906bb2b1d0d02b32abbe315135c09e64ffec91fc57b8f87117c33564684b25 -AUX pytables-3.8.0-cython3.patch 1443 BLAKE2B 064d0175ecd337d3e5628da11c784158d40459da40d5e2a9ee38033e5ab6bcb6e3bfeda5b67f5e3768c3a7554740dcbd2c063f7a786dbdbf40bc603c75f091d5 SHA512 ae3c76ba53b02f0168f1cf997980e2cfa20634348238be5bec0e9f0693d0b719ce4d7b9c547a0e635cc160c75e95bfc15181c82b5199bf2a9978a878aa894c3e -AUX pytables-3.8.0-optional-cpuinfo.patch 3185 BLAKE2B 1e5afa906c427408a81b477f4d6aa09ee903d73db3cee048464b277a69ee0f96cdc23ca660d4eb68b49ae4d88386711e5340cb4deae4632a8af0512ca5b64437 SHA512 3f9da3a9f2a95d80b2af458744a369a45725aa72fa64a316f6e281695e710aadf0d785cc80fd25639a032a9b3bf04a3f06c73c21b1812656251e8ebdaf842032 -DIST tables-3.8.0.tar.gz 8014052 BLAKE2B 28d120ad609ebc9ae8cd97286bb3fb9c484bd8a179edcf0de1b96e4400b7a21b4db835d94fae3aaee84924bd46b84b84da12c538b39517362d805651e7aa3aef SHA512 1616c00787a2e88ff3dc2aebe3a1b2ad428b5a8ea48fc94058b49c509f1c040b540b3f62551b16b3246d2fed58e0b33443cbdaaf1dfcba5a6eead5f3e8028029 -EBUILD pytables-3.8.0-r3.ebuild 1869 BLAKE2B 0680545f98f2ed98612be1d84dd6d984f11e1d27f841f72d27d80c8f24cbccac8069e4bf65d187648636d44cc5ce64a2c5d06bbea747c5b2e90cbbda2b4a3a7b SHA512 75af8585916a15f44ef727a7f0800bd9d94a032e5494b67c77dc9cf126233725c45483cd3522549a28bedbe7d3dd5fa04f87a14084d12bbbe5c0147140578eb4 -MISC metadata.xml 1090 BLAKE2B cc213079beb7f2888b5eab4886711fe8a4b7a4bc3cf13ff4d2247bd04edc05fdaed19c464ae28beac27de511ea997bcc873866bf9d544d6efe8cacd095e8640a SHA512 bd322eade443a3b1b610d262a0a6a30088246b3f772624fdfbf6eac85f240deb3f9001be1e2e20e334e65701c24e1d57100c67864d14067b1ae16e99f2136e8a diff --git a/dev-python/pytables/files/pytables-3.8.0-blosc2.patch b/dev-python/pytables/files/pytables-3.8.0-blosc2.patch deleted file mode 100644 index 59403cdec12d..000000000000 --- a/dev-python/pytables/files/pytables-3.8.0-blosc2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 99a7f336635aaeb666ea8dc791743177a030dc18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 28 Dec 2022 15:53:08 +0100 -Subject: [PATCH] Workaround blosc2 detection via blosc2 package - ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 966be028..2708deb9 100755 ---- a/setup.py -+++ b/setup.py -@@ -262,11 +262,11 @@ if __name__ == "__main__": - - debug = "--debug" in sys.argv - -- blosc2_inc, blosc2_lib = get_blosc2_directories() -+ blosc2_inc, blosc2_lib = "", "" - - # Global variables - lib_dirs = [blosc2_lib] -- inc_dirs = [Path("hdf5-blosc/src"), Path("hdf5-blosc2/src"), blosc2_inc] -+ inc_dirs = [Path("hdf5-blosc/src"), Path("hdf5-blosc2/src")] - optional_libs = [] - copy_libs = [] - --- -2.39.0 - diff --git a/dev-python/pytables/files/pytables-3.8.0-cython3.patch b/dev-python/pytables/files/pytables-3.8.0-cython3.patch deleted file mode 100644 index 9ad0b72d224a..000000000000 --- a/dev-python/pytables/files/pytables-3.8.0-cython3.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a70e36f0b0d4fb15b0b50e7ca513c4e4452767cc Mon Sep 17 00:00:00 2001 -From: Matus Valo -Date: Wed, 15 Mar 2023 22:49:07 +0100 -Subject: [PATCH] Fix build errors when compiled using cython 3.0.0b1. - ---- - pyproject.toml | 2 +- - tables/tableextension.pyx | 2 +- - tables/utilsextension.pyx | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tables/tableextension.pyx b/tables/tableextension.pyx -index 8f3bb01b..4a50c6ab 100644 ---- a/tables/tableextension.pyx -+++ b/tables/tableextension.pyx -@@ -37,7 +37,7 @@ from .utils import SizeType - from .utilsextension cimport get_native_type, cstr_to_pystr - - # numpy functions & objects --from hdf5extension cimport Leaf -+from .hdf5extension cimport Leaf - from cpython cimport PyErr_Clear - from libc.stdio cimport snprintf - from libc.stdlib cimport malloc, free -diff --git a/tables/utilsextension.pyx b/tables/utilsextension.pyx -index 5b16dcd3..664e1ea5 100644 ---- a/tables/utilsextension.pyx -+++ b/tables/utilsextension.pyx -@@ -344,7 +344,7 @@ except ImportError: - #--------------------------------------------------------------------- - - # Error handling helpers --cdef herr_t e_walk_cb(unsigned n, const H5E_error_t *err, void *data) with gil: -+cdef herr_t e_walk_cb(unsigned n, const H5E_error_t *err, void *data) noexcept with gil: - cdef object bt = data # list - #cdef char major_msg[256] - #cdef char minor_msg[256] --- -2.40.1 - diff --git a/dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch b/dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch deleted file mode 100644 index 2843914f4a87..000000000000 --- a/dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://github.com/PyTables/PyTables/pull/1013 - -From 9d2487eb53af940de3b5c79200c9f4c2b90f51f2 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 3 Apr 2023 02:07:47 +0100 -Subject: [PATCH] Handle py-cpuinfo not being installed - -Fallback gracefully if py-cpuinfo isn't installed. We already handle this in -setup.py but we need to avoid calling it in leaf.py too. - -py-cpuinfo isn't available on all platforms and PyTables is needed to run -the test suite for some software, so we need to be able to run PyTables -in places where py-cpuinfo isn't yet ported. - -Signed-off-by: Sam James ---- a/tables/leaf.py -+++ b/tables/leaf.py -@@ -4,7 +4,11 @@ import warnings - import math - - import numpy as np --import cpuinfo -+try: -+ import cpuinfo -+ missing_cpuinfo = False -+except ImportError: -+ missing_cpuinfo = True - - from .flavor import (check_flavor, internal_flavor, toarray, - alias_map as flavor_alias_map) -@@ -336,20 +340,21 @@ class Leaf(Node): - # Use a decent default value for chunksize - chunksize *= 16 - # Now, go explore the L3 size and try to find a smarter chunksize -- cpu_info = cpuinfo.get_cpu_info() -- if 'l3_cache_size' in cpu_info: -- # In general, is a good idea to set the chunksize equal to L3 -- l3_cache_size = cpu_info['l3_cache_size'] -- # cpuinfo sometimes returns cache sizes as strings (like, -- # "4096 KB"), so refuse the temptation to guess and use the -- # value only when it is an actual int. -- # Also, sometimes cpuinfo does not return a correct L3 size; -- # so in general, enforcing L3 > L2 is a good sanity check. -- l2_cache_size = cpu_info.get('l2_cache_size', "Not found") -- if (type(l3_cache_size) is int and -- type(l2_cache_size) is int and -- l3_cache_size > l2_cache_size): -- chunksize = l3_cache_size -+ if not missing_cpuinfo: -+ cpu_info = cpuinfo.get_cpu_info() -+ if 'l3_cache_size' in cpu_info: -+ # In general, is a good idea to set the chunksize equal to L3 -+ l3_cache_size = cpu_info['l3_cache_size'] -+ # cpuinfo sometimes returns cache sizes as strings (like, -+ # "4096 KB"), so refuse the temptation to guess and use the -+ # value only when it is an actual int. -+ # Also, sometimes cpuinfo does not return a correct L3 size; -+ # so in general, enforcing L3 > L2 is a good sanity check. -+ l2_cache_size = cpu_info.get('l2_cache_size', "Not found") -+ if (type(l3_cache_size) is int and -+ type(l2_cache_size) is int and -+ l3_cache_size > l2_cache_size): -+ chunksize = l3_cache_size - # In Blosc2, the chunksize cannot be larger than 2 GB - BLOSC2_MAX_BUFFERSIZE - if chunksize > 2**31 - 32: - chunksize = 2**31 - 32 --- -2.40.0 - diff --git a/dev-python/pytables/metadata.xml b/dev-python/pytables/metadata.xml deleted file mode 100644 index 2fea045e5982..000000000000 --- a/dev-python/pytables/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - python@gentoo.org - Python - - - sci@gentoo.org - Gentoo Science Project - - - PyTables is a hierarchical database package designed to efficently - manage very large amounts of data. PyTables is built on top of the - HDF5 library and the NumPy package. It features an object-oriented - interface that, combined with natural naming and C-code generated - from Pyrex sources, makes it a fast, yet extremely easy to use tool - for interactively save and retrieve large amounts of data. - - - Enables runtime CPU detection (useful for bindist, compatibility on other CPUs) - - - PyTables/PyTables - tables - - diff --git a/dev-python/pytables/pytables-3.8.0-r3.ebuild b/dev-python/pytables/pytables-3.8.0-r3.ebuild deleted file mode 100644 index b585b56728f0..000000000000 --- a/dev-python/pytables/pytables-3.8.0-r3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -PYPI_PN="tables" -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 prefix pypi - -DESCRIPTION="Hierarchical datasets for Python" -HOMEPAGE=" - https://www.pytables.org/ - https://github.com/PyTables/PyTables/ - https://pypi.org/project/tables/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+cpudetection examples test" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/bzip2:0= - app-arch/lz4:0= - >=app-arch/zstd-1.0.0:= - >=dev-libs/c-blosc-1.11.1:0= - dev-libs/c-blosc2:= - dev-libs/lzo:2= - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=sci-libs/hdf5-1.8.4:= -" -RDEPEND=" - ${DEPEND} - >=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] ) -" -BDEPEND=" - >=dev-python/cython-0.21[${PYTHON_USEDEP}] - virtual/pkgconfig - cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] ) - test? ( - ${RDEPEND} - ) -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/${P}-blosc2.patch - "${FILESDIR}"/${P}-optional-cpuinfo.patch - "${FILESDIR}"/${P}-cython3.patch - ) - - export PYTABLES_NO_EMBEDDED_LIBS=1 - export USE_PKGCONFIG=TRUE - - rm -r c-blosc/{blosc,internal-complibs} || die - rm tables/libblosc2.so || die - sed -i -e '/blosc2/d' requirements.txt || die - hprefixify -w '/prefixes =/' setup.py - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile -j1 -} - -python_test() { - cd "${BUILD_DIR}"/lib* || die - "${EPYTHON}" tables/tests/test_all.py -v || die -} - -python_install_all() { - distutils-r1_python_install_all - - if use examples; then - dodoc -r contrib examples - docompress -x /usr/share/doc/${PF}/{contrib,examples} - fi -} -- cgit v1.2.3