From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6053215802F for ; Mon, 3 Apr 2023 01:51:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3D6CE07D0; Mon, 3 Apr 2023 01:51:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84549E07D0 for ; Mon, 3 Apr 2023 01:51:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C5B1340AB5 for ; Mon, 3 Apr 2023 01:51:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E2ED8E4 for ; Mon, 3 Apr 2023 01:51:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1680486620.637784cae39a93920b9738e8094d46d24331769d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytables/, dev-python/pytables/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch dev-python/pytables/pytables-3.8.0-r2.ebuild dev-python/pytables/pytables-3.8.0-r3.ebuild X-VCS-Directories: dev-python/pytables/ dev-python/pytables/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 637784cae39a93920b9738e8094d46d24331769d X-VCS-Branch: master Date: Mon, 3 Apr 2023 01:51:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7ff5ffc-2c23-461e-9b77-90c9adb83218 X-Archives-Hash: 971599a628488b9df28481e2f8d5e1ff commit: 637784cae39a93920b9738e8094d46d24331769d Author: Sam James gentoo org> AuthorDate: Mon Apr 3 01:50:20 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 3 01:50:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637784ca dev-python/pytables: tweak cpuinfo patch Signed-off-by: Sam James gentoo.org> dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch | 9 ++++++--- .../{pytables-3.8.0-r2.ebuild => pytables-3.8.0-r3.ebuild} | 0 2 files changed, 6 insertions(+), 3 deletions(-) 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 index f56854b05289..2843914f4a87 100644 --- a/dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch +++ b/dev-python/pytables/files/pytables-3.8.0-optional-cpuinfo.patch @@ -1,6 +1,6 @@ https://github.com/PyTables/PyTables/pull/1013 -From 557f8c22b772506bfbb9e7eb4d60c0cf2125998b Mon Sep 17 00:00:00 2001 +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 @@ -15,19 +15,20 @@ 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,10 @@ +@@ -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 +339,21 @@ def _calc_chunkshape(self, expectedrows, rowsize, itemsize): +@@ -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 @@ -63,4 +64,6 @@ Signed-off-by: Sam James # 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/pytables-3.8.0-r2.ebuild b/dev-python/pytables/pytables-3.8.0-r3.ebuild similarity index 100% rename from dev-python/pytables/pytables-3.8.0-r2.ebuild rename to dev-python/pytables/pytables-3.8.0-r3.ebuild