summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Rivera <stefanor@debian.org>2023-05-05 10:21:39 -0400
committerStefano Rivera <stefanor@debian.org>2023-05-05 10:21:39 -0400
commit2ec43ffdf730742973b89f802f2dcf962e598e16 (patch)
tree7186aa7fb5e023a2c5cba84dd77675661fb293e9
parenta1eb4bb8d55876c29665caa95f4d7755a24ef65a (diff)
Edit the description of the mips*el patch, now that we understand it.
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0008-python3.11-fix.patch14
-rw-r--r--debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch7
3 files changed, 22 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index ad5b735..ae8a928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+silx (1.1.0+dfsg-6) UNRELEASED; urgency=medium
+
+ * Edit the description of the mips*el patch, now that we understand it.
+
+ -- Stefano Rivera <stefanor@debian.org> Fri, 05 May 2023 10:21:15 -0400
+
silx (1.1.0+dfsg-5) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0008-python3.11-fix.patch b/debian/patches/0008-python3.11-fix.patch
index 79b1b9b..346e0fe 100644
--- a/debian/patches/0008-python3.11-fix.patch
+++ b/debian/patches/0008-python3.11-fix.patch
@@ -1,9 +1,17 @@
-Description: Remove special-case for Python 3.11
-Author: Simon Quigley <tsimonq2@debian.org>
+From: Simon Quigley <tsimonq2@debian.org>
+Date: Fri, 3 Feb 2023 15:35:46 -0400
+Subject: Remove special-case for Python 3.11
+
Origin: vendor
Last-Update: 2023-01-26
+
+Last-Update: 2023-01-26
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ src/silx/gui/utils/testutils.py | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/silx/gui/utils/testutils.py b/src/silx/gui/utils/testutils.py
+index 1ec9b0b..81ce2c4 100644
--- a/src/silx/gui/utils/testutils.py
+++ b/src/silx/gui/utils/testutils.py
@@ -141,14 +141,10 @@ class TestCaseQt(unittest.TestCase):
diff --git a/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch b/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch
index 27a396a..f84e01a 100644
--- a/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch
+++ b/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch
@@ -2,8 +2,11 @@ From: Stefano Rivera <stefanor@debian.org>
Date: Fri, 3 Feb 2023 15:34:10 -0400
Subject: Skip testing nanmin() on float64 arrays on mips*el
-This fails on mipsel and mips64el, due to a numpy bug:
-Bug-numpy: https://github.com/numpy/numpy/issues/23158
+There was an ABI break in NAN handling on MIPS that hasn't been fully
+dealt with, yet. See:
+https://sourceware.org/binutils/docs/as/MIPS-NaN-Encodings.html
+
+Discussion in the numpy bug: https://github.com/numpy/numpy/issues/23158
---
src/silx/math/test/test_combo.py | 7 +++++++
1 file changed, 7 insertions(+)