Control: tags 999538 + patch
Control: tags 999538 + pending
Dear maintainer,
I've prepared an NMU for pytables (versioned as 3.6.1-5.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Also available as an MR:
https://salsa.debian.org/science-team/pytables/-/merge_requests/1
Regards,
SR
diff -Nru pytables-3.6.1/debian/changelog pytables-3.6.1/debian/changelog
--- pytables-3.6.1/debian/changelog 2021-09-28 02:05:13.0 -0400
+++ pytables-3.6.1/debian/changelog 2021-11-20 23:32:58.0 -0400
@@ -1,3 +1,12 @@
+pytables (3.6.1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Patch: Fix FTBFS with numpy >= 1.20 (Closes: #999538)
+ * Patch: Fix FTBFS with Python 3.10.
+ * Install Python 3.10 C Extensions (2-digit minor version).
+
+ -- Stefano Rivera Sat, 20 Nov 2021 23:32:58 -0400
+
pytables (3.6.1-5) unstable; urgency=medium
* debian/control:
diff -Nru pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch
--- pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch 1969-12-31 20:00:00.0 -0400
+++ pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch 2021-11-20 23:32:58.0 -0400
@@ -0,0 +1,176 @@
+From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?=
+Date: Sun, 24 Jan 2021 16:36:21 +0100
+Subject: Use lowercase float/int as numpy dtype
+
+Float64 is gone with numpy 1.20, which causes doctests to fail
+(https://bugzilla.redhat.com/show_bug.cgi?id=1914335).
+
+Similarly all uses of Float32, Int32 should be replaced by float32 and int32.
+
+>>> numpy.__version__
+'1.19.4'
+>>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')]
+['float16', 'Float16', 'float32', 'Float32', 'float64', 'Float64', 'float128', 'Float128', 'float_', 'float']
+
+>>> numpy.__version__
+'1.20.0rc2'
+>>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')]
+['float16', 'float32', 'float64', 'float128', 'float_', 'float']
+
+Bug-Upstream: https://github.com/PyTables/PyTables/issues/875
+Bug-Debian: https://bugs.debian.org/999538
+Origin: upstream, https://github.com/PyTables/PyTables/pull/862
+---
+ bench/bsddb-table-bench.py | 10 +-
+ bench/postgres-search-bench.py | 4 ++--
+ bench/pytables-search-bench.py | 6 +++---
+ bench/recarray2-test.py| 2 +-
+ bench/shelve-bench.py | 10 +-
+ bench/sqlite-search-bench.py | 4 ++--
+ tables/atom.py | 2 +-
+ 7 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/bench/bsddb-table-bench.py b/bench/bsddb-table-bench.py
+index dd9f875..a2e0236 100644
+--- a/bench/bsddb-table-bench.py
b/bench/bsddb-table-bench.py
+@@ -83,11 +83,11 @@ def createFile(filename, totalrows, recsize, verbose):
+ # Get the record object associated with the new table
+ if recsize == "big":
+ isrec = Big()
+-arr = np.array(np.arange(32), type=np.Float64)
+-arr2 = np.array(np.arange(32), type=np.Float64)
++arr = np.array(np.arange(32), type=np.float64)
++arr2 = np.array(np.arange(32), type=np.float64)
+ elif recsize == "medium":
+ isrec = Medium()
+-arr = np.array(np.arange(2), type=np.Float64)
++arr = np.array(np.arange(2), type=np.float64)
+ else:
+ isrec = Small()
+ # print d
+@@ -107,8 +107,8 @@ def createFile(filename, totalrows, recsize, verbose):
+ #d['TDCcount'] = i % 256
+ d['ADCcount'] = (i * 256) % (1 << 16)
+ if recsize == "big":
+-#d.float1 = np.array([i]*32, np.Float64)
+-#d.float2 = np.array([i**2]*32, np.Float64)
++#d.float1 = np.array([i]*32, np.float64)
++#d.float2 = np.array([i**2]*32, np.float64)
+ arr[0] = 1.1
+ d['float1'] = arr
+ arr2[0] = 2.2
+diff --git a/bench/postgres-search-bench.py b/bench/postgres-search-bench.py
+index d2c9f4f..7fe83f6 100644
+--- a/bench/postgres-search-bench.py
b/bench/postgres-search-bench.py
+@@ -15,11 +15,11 @@ def flatten(l):
+
+
+ def fill_arrays(start, stop):
+-col_i = numpy.arange(start, stop, type=numpy.Int32)
++col_i = numpy.arange(start, stop, type=numpy.int32)
+ if userandom:
+ col_j = numpy.random.uniform(0, nrows, size=[stop - start])
+ else:
+-col_j = numpy.array(col_i, type=numpy.Float64)
++col_j = numpy.array(col_i, type=numpy.float64)
+ return col_i, col_j
+
+ # Generator for ensure pytables benchmark compatibility
+diff --git a/bench/pytables-search-bench.py b/bench/pytables-search-bench.py
+index 726d30b..6417186 100644
+--- a/bench/pytables-search-bench.py
b/bench/pytables-search-bench.py
+@@ -37,11 +37,11 @@ def create_db(filename, nrows):
+ stop = (j + 1) * step
+ if stop > nrows:
+
