* [gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
@ 2020-12-24 0:19 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-12-24 0:19 UTC (permalink / raw
To: gentoo-commits
commit: 005d860137c26db588503516ffa584f79b2dee78
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 00:19:23 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 00:19:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005d8601
dev-python/blosc: Bump to 1.10.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/blosc/Manifest | 1 +
dev-python/blosc/blosc-1.10.0.ebuild | 46 ++++++++++++++++++++++
dev-python/blosc/files/blosc-1.10.0-unbundle.patch | 38 ++++++++++++++++++
3 files changed, 85 insertions(+)
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index e8bdd9e7727..4bb979ce2e5 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1 +1,2 @@
+DIST blosc-1.10.0.tar.gz 845312 BLAKE2B 15f367f1420f56e64ec01e74d7320adc194db11d15bd26a2b78c59c88a6127f1d2b5fc7bd53e02a6d0cad785c87cf79bb909dec62982b5ee8620c92ccdd80249 SHA512 f071d131966acd74cf71f8688ae9830091ee12a92399e8736f2b2cc2243bc022f9fd194c60493e912aef87a54202813a67a8f9bddd90c1c44631205d58c3f3e3
DIST blosc-1.9.2.tar.gz 816897 BLAKE2B 7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478 SHA512 a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f
diff --git a/dev-python/blosc/blosc-1.10.0.ebuild b/dev-python/blosc/blosc-1.10.0.ebuild
new file mode 100644
index 00000000000..1423adda4bd
--- /dev/null
+++ b/dev-python/blosc/blosc-1.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-python/scikit-build[${PYTHON_USEDEP}]
+ test? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+"
+
+DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
+PATCHES=(
+ "${FILESDIR}"/blosc-1.10.0-unbundle.patch
+)
+
+python_prepare_all() {
+ export BLOSC_DIR="${EPREFIX}/usr"
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${EPYTHON}" -m blosc.test -v || die
+}
+
+python_install() {
+ distutils-r1_python_install
+ python_optimize
+}
diff --git a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
new file mode 100644
index 00000000000..0ea6740f9c0
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
@@ -0,0 +1,38 @@
+From b2935461d889eac99fa1bdfb04a96f1c3a23c4c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 24 Dec 2020 01:06:23 +0100
+Subject: [PATCH] build against system blosc
+
+---
+ blosc/CMakeLists.txt | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
+index 7f06f28..fcf7db0 100644
+--- a/blosc/CMakeLists.txt
++++ b/blosc/CMakeLists.txt
+@@ -1,19 +1,9 @@
+ # Todo: c-blosc provides a CMake package configuration file that we can build
+ # against if blosc is available on the system, etc.
+-# find_package(blosc)
+-# if(NOT blosc_FOUND)
+-set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.")
+-set(BUILD_SHARED ON CACHE BOOL "Build a shared library version of the blosc library.")
+-set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library")
+-set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library")
+-set(BLOSC_IS_SUBPROJECT OFF CACHE BOOL "Blosc is subproject")
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+-add_subdirectory(c-blosc)
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/c-blosc/blosc")
+-
++find_package(blosc)
+
+ add_library(blosc_extension MODULE blosc_extension.c)
+-target_link_libraries(blosc_extension blosc_static)
++target_link_libraries(blosc_extension blosc)
+ python_extension_module(blosc_extension)
+
+ add_custom_command(
+--
+2.29.2
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
@ 2021-01-31 20:04 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-01-31 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 56b0faee408015634a450c6ce608923497aab644
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 19:52:20 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 20:04:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b0faee
dev-python/blosc: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/blosc/Manifest | 2 -
dev-python/blosc/blosc-1.10.0.ebuild | 46 ---------------------
dev-python/blosc/blosc-1.9.2.ebuild | 49 -----------------------
dev-python/blosc/files/blosc-1.9.1-unbundle.patch | 23 -----------
4 files changed, 120 deletions(-)
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 527dee909a8..4751f705fe7 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,4 +1,2 @@
-DIST blosc-1.10.0.tar.gz 845312 BLAKE2B 15f367f1420f56e64ec01e74d7320adc194db11d15bd26a2b78c59c88a6127f1d2b5fc7bd53e02a6d0cad785c87cf79bb909dec62982b5ee8620c92ccdd80249 SHA512 f071d131966acd74cf71f8688ae9830091ee12a92399e8736f2b2cc2243bc022f9fd194c60493e912aef87a54202813a67a8f9bddd90c1c44631205d58c3f3e3
DIST blosc-1.10.1.tar.gz 858162 BLAKE2B 768ae6d438d9fe05589460dcaeea77dbf2e0212bbc67388c6df1b9fc6bd1921e8cd79da2039cd4300cd91923d7988f8c4741ea1dbd5ebfa13e48f3ade678ac09 SHA512 06e393efa3fc7060205a483787eb4c5befe75dfdd6321b37c43ed7830dccf4d622bd88451e97da663ed9dc9302c30d7486315de9aff6351721862e2eceddd9a3
DIST blosc-1.10.2.tar.gz 858096 BLAKE2B ff314011e1afc2d972c2445df9ad25c245494479201ddd0944ddf5f14aa0aa772c9da1e117eb5395f5488e7238aefe1236d9a5579b4d03be2b041790de9575e8 SHA512 82dab50a49ddd45d8276fd43999233f41b507e35af5897ed4945565fde8f56be0855b0dd926d254bd77904ec7a13ad3f024007159510b677769d97599b731222
-DIST blosc-1.9.2.tar.gz 816897 BLAKE2B 7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478 SHA512 a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f
diff --git a/dev-python/blosc/blosc-1.10.0.ebuild b/dev-python/blosc/blosc-1.10.0.ebuild
deleted file mode 100644
index 115df5959d2..00000000000
--- a/dev-python/blosc/blosc-1.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-python/scikit-build[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-PATCHES=(
- "${FILESDIR}"/blosc-1.10.0-unbundle.patch
-)
-
-python_prepare_all() {
- export BLOSC_DIR="${EPREFIX}/usr"
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${EPYTHON}" -m blosc.test -v || die
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize
-}
diff --git a/dev-python/blosc/blosc-1.9.2.ebuild b/dev-python/blosc/blosc-1.9.2.ebuild
deleted file mode 100644
index f09441ce889..00000000000
--- a/dev-python/blosc/blosc-1.9.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-python/scikit-build[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/blosc-1.9.1-unbundle.patch
-)
-
-python_prepare_all() {
- export BLOSC_DIR="${EPREFIX}/usr"
- distutils-r1_python_prepare_all
- DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib || die
- PYTHONPATH=. nosetests -v || die
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize
-}
diff --git a/dev-python/blosc/files/blosc-1.9.1-unbundle.patch b/dev-python/blosc/files/blosc-1.9.1-unbundle.patch
deleted file mode 100644
index 55af5f0c621..00000000000
--- a/dev-python/blosc/files/blosc-1.9.1-unbundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2711877..a4c949c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,16 +4,9 @@ find_package(PythonExtensions REQUIRED)
-
- # Todo: c-blosc provides a CMake package configuration file that we can build
- # against if blosc is available on the system, etc.
--# find_package(blosc)
--# if(NOT blosc_FOUND)
--set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.")
--set(BUILD_SHARED OFF CACHE BOOL "Build a shared library version of the blosc library.")
--set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library")
--set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library")
--set(CMAKE_POSITION_INDEPENDENT_CODE ON)
--add_subdirectory(c-blosc)
-+find_package(blosc)
-
- add_library(blosc_extension MODULE blosc/blosc_extension.c)
--target_link_libraries(blosc_extension blosc_static)
-+target_link_libraries(blosc_extension blosc)
- python_extension_module(blosc_extension)
- install(TARGETS blosc_extension LIBRARY DESTINATION blosc)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
@ 2021-09-06 0:10 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-09-06 0:10 UTC (permalink / raw
To: gentoo-commits
commit: 76f9ac47a4e34c05b9c3a5189d4799938f909843
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 6 00:10:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 6 00:10:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f9ac47
dev-python/blosc: fix build on non-amd64/x86 (CPU flags)
Closes: https://bugs.gentoo.org/732178
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/blosc/blosc-1.10.4.ebuild | 1 +
.../blosc/files/blosc-1.10.4-cpu-flags.patch | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index 8acd8a97e75..e8ef10b43d6 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
PATCHES=(
"${FILESDIR}"/blosc-1.10.0-unbundle.patch
+ "${FILESDIR}"/blosc-1.10.4-cpu-flags.patch
)
python_prepare_all() {
diff --git a/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch b/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch
new file mode 100644
index 00000000000..1e264164613
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch
@@ -0,0 +1,22 @@
+https://github.com/Blosc/python-blosc/commit/70226a70907072be607caee3da472e37a4683bae
+https://github.com/Blosc/python-blosc/issues/227
+https://bugs.gentoo.org/732178
+
+From: Graham Inggs <ginggs@debian.org>
+Date: Tue, 3 Aug 2021 17:11:51 +0200
+Subject: [PATCH] Deactivate SSE2 and AVX2 if a CPU has no flags (#242)
+
+Fixes #277
+--- a/setup.py
++++ b/setup.py
+@@ -90,8 +90,8 @@ def cmake_bool(cond):
+ platforms = ['any'],
+ cmake_args = [
+ '-DBLOSC_DIR:PATH=%s' % os.environ.get('BLOSC_DIR', ''),
+- '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('sse2' not in cpu_info['flags'])),
+- '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('avx2' not in cpu_info['flags'])),
++ '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('flags' not in cpu_info) or ('sse2' not in cpu_info['flags'])),
++ '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('flags' not in cpu_info) or ('avx2' not in cpu_info['flags'])),
+ '-DDEACTIVATE_LZ4:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_LZ4', '1'))),
+ # Snappy is disabled by default
+ '-DDEACTIVATE_SNAPPY:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_SNAPPY', '0'))),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
@ 2024-06-16 7:14 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-06-16 7:14 UTC (permalink / raw
To: gentoo-commits
commit: 5aa895d9c03be3b5c0d3fa80148d2ab41e79e440
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 07:03:07 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 07:03:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa895d9
dev-python/blosc: Fix test failures with >=dev-python/numpy-2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/blosc/blosc-1.11.1.ebuild | 5 +++
dev-python/blosc/files/blosc-1.11.1-numpy-2.patch | 51 +++++++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/dev-python/blosc/blosc-1.11.1.ebuild b/dev-python/blosc/blosc-1.11.1.ebuild
index a6135a6ca9c4..d61d1db5fca0 100644
--- a/dev-python/blosc/blosc-1.11.1.ebuild
+++ b/dev-python/blosc/blosc-1.11.1.ebuild
@@ -45,6 +45,11 @@ BDEPEND="
DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
+PATCHES=(
+ # https://github.com/Blosc/python-blosc/pull/329
+ "${FILESDIR}/${P}-numpy-2.patch"
+)
+
src_configure() {
export USE_SYSTEM_BLOSC=1
export BLOSC_DIR="${EPREFIX}/usr"
diff --git a/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch b/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch
new file mode 100644
index 000000000000..97010c0a4bf6
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch
@@ -0,0 +1,51 @@
+From 4823cb746023821166756322becd3fc242cd0b32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 16 Jun 2024 08:59:36 +0200
+Subject: [PATCH] Fix test failures with NumPy 2
+
+* Replace deprecated `np.alltrue()` with `np.all()` (available since
+ NumPy 1.7.0).
+
+* Cast NumPy boolean to `bool()`, to ensure doctests pass both with
+ NumPy 2 (using `np.True_`) and NumPy 1 (using plain `True`).
+---
+ blosc/toplevel.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/blosc/toplevel.py b/blosc/toplevel.py
+index ad9c12d..4d2d413 100644
+--- a/blosc/toplevel.py
++++ b/blosc/toplevel.py
+@@ -514,7 +514,7 @@ def compress_ptr(address, items, typesize=8, clevel=9, shuffle=blosc.SHUFFLE,
+ items, np_array.dtype.itemsize)
+ >>> d = blosc.decompress(c)
+ >>> np_ans = numpy.fromstring(d, dtype=np_array.dtype)
+- >>> (np_array == np_ans).all()
++ >>> bool((np_array == np_ans).all())
+ True
+
+ >>> import ctypes
+@@ -640,7 +640,7 @@ def decompress_ptr(bytes_like, address):
+ items, np_array.dtype.itemsize)
+ >>> np_ans = numpy.empty(items, dtype=np_array.dtype)
+ >>> nbytes = blosc.decompress_ptr(c, np_ans.__array_interface__['data'][0])
+- >>> (np_array == np_ans).all()
++ >>> bool((np_array == np_ans).all())
+ True
+ >>> nbytes == items * np_array.dtype.itemsize
+ True
+@@ -769,12 +769,12 @@ def unpack_array(packed_array, **kwargs):
+ >>> len(parray) < a.size*a.itemsize
+ True
+ >>> a2 = blosc.unpack_array(parray)
+- >>> numpy.alltrue(a == a2)
++ >>> bool(numpy.all(a == a2))
+ True
+ >>> a = numpy.array(['å', 'ç', 'ø'])
+ >>> parray = blosc.pack_array(a)
+ >>> a2 = blosc.unpack_array(parray)
+- >>> numpy.alltrue(a == a2)
++ >>> bool(numpy.all(a == a2))
+ True
+ """
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
@ 2024-07-13 19:25 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-07-13 19:25 UTC (permalink / raw
To: gentoo-commits
commit: ec75fc66974fc1d0b9751e23feb931e9f6f3c0e2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 19:14:41 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 19:25:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec75fc66
dev-python/blosc: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/blosc/Manifest | 1 -
dev-python/blosc/blosc-1.11.1.ebuild | 68 -----------------------
dev-python/blosc/files/blosc-1.11.1-numpy-2.patch | 51 -----------------
3 files changed, 120 deletions(-)
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index ac1040693d95..16659d2bec3f 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,2 +1 @@
-DIST python-blosc-1.11.1.gh.tar.gz 111262 BLAKE2B cb348253a24258d2649ebc0604acbf936b8ccc2b28c42c69da2fee72ddf87eb17a24657bc5d3c0530193a60f482555ce4cc5d168a18d9c2d79a13410d40670bc SHA512 21f8a697a3a902860a6ed72233984cf00c464ec0ddde9842a0c24b1e8e5ec4dd57b872096445a873d162d7529cba5c3666ba2a3ee3f9b1b18107d9636011281c
DIST python-blosc-1.11.2.gh.tar.gz 99160 BLAKE2B 79176961221a2dcdf389165b3ed0e629201605f806aca3e1ada1dd9b35c1acf13ea7fa6692a762f5e31270df327751642256a1c5bafb14fbed48ef69c6b9745c SHA512 56a53828669ac9d1452b247b8aad6bdfcb71ecffe9b8c7723e4405825704506946f150f54633b7e0886160255e5619c698b97847963c909e14c97808c04f39ab
diff --git a/dev-python/blosc/blosc-1.11.1.ebuild b/dev-python/blosc/blosc-1.11.1.ebuild
deleted file mode 100644
index 560554b6dde2..000000000000
--- a/dev-python/blosc/blosc-1.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-blosc-${PV}
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="
- https://www.blosc.org/
- https://github.com/Blosc/python-blosc/
- https://pypi.org/project/blosc/
-"
-SRC_URI="
- https://github.com/Blosc/python-blosc/archive/v${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/c-blosc-1.19.0:=
-"
-DEPEND="
- ${RDEPEND}
-"
-# py-cpuinfo dep is irrelevant for us, as it is only used to configure
-# bundled c-blosc build
-BDEPEND="
- dev-python/scikit-build[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-
-PATCHES=(
- # https://github.com/Blosc/python-blosc/pull/329
- "${FILESDIR}/${P}-numpy-2.patch"
-)
-
-src_configure() {
- export USE_SYSTEM_BLOSC=1
- export BLOSC_DIR="${EPREFIX}/usr"
-}
-
-python_compile() {
- distutils-r1_python_compile
-
- # scikit-build is broken and reuses the same build
- # https://github.com/scikit-build/scikit-build/issues/633
- rm -r _skbuild || die
-}
-
-python_test() {
- "${EPYTHON}" -m blosc.test -v || die
-}
diff --git a/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch b/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch
deleted file mode 100644
index 97010c0a4bf6..000000000000
--- a/dev-python/blosc/files/blosc-1.11.1-numpy-2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4823cb746023821166756322becd3fc242cd0b32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 16 Jun 2024 08:59:36 +0200
-Subject: [PATCH] Fix test failures with NumPy 2
-
-* Replace deprecated `np.alltrue()` with `np.all()` (available since
- NumPy 1.7.0).
-
-* Cast NumPy boolean to `bool()`, to ensure doctests pass both with
- NumPy 2 (using `np.True_`) and NumPy 1 (using plain `True`).
----
- blosc/toplevel.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/blosc/toplevel.py b/blosc/toplevel.py
-index ad9c12d..4d2d413 100644
---- a/blosc/toplevel.py
-+++ b/blosc/toplevel.py
-@@ -514,7 +514,7 @@ def compress_ptr(address, items, typesize=8, clevel=9, shuffle=blosc.SHUFFLE,
- items, np_array.dtype.itemsize)
- >>> d = blosc.decompress(c)
- >>> np_ans = numpy.fromstring(d, dtype=np_array.dtype)
-- >>> (np_array == np_ans).all()
-+ >>> bool((np_array == np_ans).all())
- True
-
- >>> import ctypes
-@@ -640,7 +640,7 @@ def decompress_ptr(bytes_like, address):
- items, np_array.dtype.itemsize)
- >>> np_ans = numpy.empty(items, dtype=np_array.dtype)
- >>> nbytes = blosc.decompress_ptr(c, np_ans.__array_interface__['data'][0])
-- >>> (np_array == np_ans).all()
-+ >>> bool((np_array == np_ans).all())
- True
- >>> nbytes == items * np_array.dtype.itemsize
- True
-@@ -769,12 +769,12 @@ def unpack_array(packed_array, **kwargs):
- >>> len(parray) < a.size*a.itemsize
- True
- >>> a2 = blosc.unpack_array(parray)
-- >>> numpy.alltrue(a == a2)
-+ >>> bool(numpy.all(a == a2))
- True
- >>> a = numpy.array(['å', 'ç', 'ø'])
- >>> parray = blosc.pack_array(a)
- >>> a2 = blosc.unpack_array(parray)
-- >>> numpy.alltrue(a == a2)
-+ >>> bool(numpy.all(a == a2))
- True
- """
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-13 19:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-24 0:19 [gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-01-31 20:04 Michał Górny
2021-09-06 0:10 Sam James
2024-06-16 7:14 Michał Górny
2024-07-13 19:25 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox