refresh patch series

6 files changed, 46 insertions, 33 deletions

diff --git a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
index 5c52c11..e6ff374 100644
--- a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
+++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
@@ -8,10 +8,10 @@ Subject: use the system mathjax (privacy breach)
  1 file changed, 5 insertions(+)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 7e173f3..86e7bfa 100644
+index 2d242e9..38b531d 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -144,6 +144,11 @@ pygments_style = 'sphinx'
+@@ -138,6 +138,11 @@ pygments_style = 'sphinx'
  # A list of ignored prefixes for module index sorting.
  # modindex_common_prefix = []
  
diff --git a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
index bdefa54..6453274 100644
--- a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
+++ b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
@@ -7,10 +7,10 @@ Subject: do not modify PYTHONPATH from setup.py
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 045b9a0..c095b89 100644
+index 527c072..04599d9 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -296,7 +296,8 @@ class BuildMan(Command):
+@@ -229,7 +229,8 @@ class BuildMan(Command):
          path.insert(0, os.path.abspath(build.build_lib))
  
          env = dict((str(k), str(v)) for k, v in os.environ.items())
diff --git a/debian/patches/0004-skip-two-tests.patch b/debian/patches/0004-skip-two-tests.patch
index a62e77f..fbef5d1 100644
--- a/debian/patches/0004-skip-two-tests.patch
+++ b/debian/patches/0004-skip-two-tests.patch
@@ -8,10 +8,10 @@ Subject: skip two tests
  1 file changed, 2 insertions(+)
 
 diff --git a/src/silx/io/test/test_h5py_utils.py b/src/silx/io/test/test_h5py_utils.py
-index ea46eca..847a7b9 100644
+index 0d10a78..f6405c6 100644
 --- a/src/silx/io/test/test_h5py_utils.py
 +++ b/src/silx/io/test/test_h5py_utils.py
-@@ -249,6 +249,7 @@ class TestH5pyUtils(unittest.TestCase):
+@@ -248,6 +248,7 @@ class TestH5pyUtils(unittest.TestCase):
          "Versions of libhdf5 and h5py use incompatible file locking behaviour",
      )
      @subtests
@@ -19,7 +19,7 @@ index ea46eca..847a7b9 100644
      def test_modes_multi_process(self):
          """Test concurrent access to the same file from different processes"""
          filename = self._new_filename()
-@@ -323,6 +324,7 @@ class TestH5pyUtils(unittest.TestCase):
+@@ -322,6 +323,7 @@ class TestH5pyUtils(unittest.TestCase):
  
      @subtests
      @unittest.skipIf(not h5py_utils.HAS_SWMR, "SWMR not supported")
diff --git a/debian/patches/0005-removed-hdf5plugin-from-full-dependencies.patch b/debian/patches/0005-removed-hdf5plugin-from-full-dependencies.patch
index 36147f7..d1965e0 100644
--- a/debian/patches/0005-removed-hdf5plugin-from-full-dependencies.patch
+++ b/debian/patches/0005-removed-hdf5plugin-from-full-dependencies.patch
@@ -7,10 +7,10 @@ Subject: removed hdf5plugin from full dependencies
  1 file changed, 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index c095b89..40e384b 100644
+index 04599d9..18e10cc 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -853,7 +853,6 @@ def get_project_configuration(dry_run):
+@@ -516,7 +516,6 @@ def get_project_configuration():
          'python-dateutil',
          'PyQt5',
          # extra
diff --git a/debian/patches/0006-Tests-if-openCL-can-be-used.patch b/debian/patches/0006-Tests-if-openCL-can-be-used.patch
index c332d19..6fd8a20 100644
--- a/debian/patches/0006-Tests-if-openCL-can-be-used.patch
+++ b/debian/patches/0006-Tests-if-openCL-can-be-used.patch
@@ -7,10 +7,10 @@ Subject: Tests if openCL can be used
  1 file changed, 2 insertions(+)
 
 diff --git a/src/silx/opencl/common.py b/src/silx/opencl/common.py
-index 60849d6..888b1da 100644
+index cf51406..5702f74 100644
 --- a/src/silx/opencl/common.py
 +++ b/src/silx/opencl/common.py
-@@ -74,6 +74,8 @@ if pyopencl is None:
+@@ -73,6 +73,8 @@ if pyopencl is None:
          WRITE_ONLY = 1
          READ_ONLY = 1
          READ_WRITE = 1
diff --git a/debian/patches/0007-python3.10-fix.patch b/debian/patches/0007-python3.10-fix.patch
index c046e6f..c36eeb8 100644
--- a/debian/patches/0007-python3.10-fix.patch
+++ b/debian/patches/0007-python3.10-fix.patch
@@ -1,9 +1,18 @@
 From: Nilesh Patra <nilesh@debian.org>
-Date: Mon, 13 Mar 2022 03:37:32 +0100
+Date: Sun, 13 Mar 2022 03:37:32 +0100
 Subject: Fix int compare with python3.10, skip a couple of tests
+
+---
+ src/silx/app/view/About.py                 | 2 +-
+ src/silx/gui/data/test/test_arraywidget.py | 2 ++
+ src/silx/opencl/test/test_medfilt.py       | 4 +++-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/silx/app/view/About.py b/src/silx/app/view/About.py
+index 2af7ed4..eb5ec16 100644
 --- a/src/silx/app/view/About.py
 +++ b/src/silx/app/view/About.py
-@@ -243,7 +243,7 @@
+@@ -242,7 +242,7 @@ class About(qt.QDialog):
                  width = hardLimit
  
          height = layoutMinimumSize.height()
@@ -12,9 +21,31 @@ Subject: Fix int compare with python3.10, skip a couple of tests
  
      @staticmethod
      def about(parent, applicationName):
+diff --git a/src/silx/gui/data/test/test_arraywidget.py b/src/silx/gui/data/test/test_arraywidget.py
+index 024383d..915238d 100644
+--- a/src/silx/gui/data/test/test_arraywidget.py
++++ b/src/silx/gui/data/test/test_arraywidget.py
+@@ -28,6 +28,7 @@ __date__ = "05/12/2016"
+ import os
+ import tempfile
+ import unittest
++import pytest
+ 
+ import numpy
+ 
+@@ -186,6 +187,7 @@ class TestArrayWidget(TestCaseQt):
+         b1 = self.aw.getData(copy=False)
+         self.assertIs(b0, b1)
+ 
++    @pytest.mark.skip(reason="Skip for now since it chokes witth py3.10")
+     def testClipping(self):
+         """Test clipping of large arrays"""
+         self.aw.show()
+diff --git a/src/silx/opencl/test/test_medfilt.py b/src/silx/opencl/test/test_medfilt.py
+index e657d0d..dfc598d 100644
 --- a/src/silx/opencl/test/test_medfilt.py
 +++ b/src/silx/opencl/test/test_medfilt.py
-@@ -43,6 +43,8 @@
+@@ -40,6 +40,8 @@ import time
  import logging
  import numpy
  import unittest
@@ -23,7 +54,7 @@ Subject: Fix int compare with python3.10, skip a couple of tests
  from collections import namedtuple
  try:
      import mako
-@@ -72,7 +74,7 @@
+@@ -69,7 +71,7 @@ except:
      HAS_SCIPY = False
      from silx.math import medfilt2d as median_filter
  
@@ -32,21 +63,3 @@ Subject: Fix int compare with python3.10, skip a couple of tests
  class TestMedianFilter(unittest.TestCase):
  
      def setUp(self):
---- a/src/silx/gui/data/test/test_arraywidget.py
-+++ b/src/silx/gui/data/test/test_arraywidget.py
-@@ -29,6 +29,7 @@
- import os
- import tempfile
- import unittest
-+import pytest
- 
- import numpy
- 
-@@ -187,6 +188,7 @@
-         b1 = self.aw.getData(copy=False)
-         self.assertIs(b0, b1)
- 
-+    @pytest.mark.skip(reason="Skip for now since it chokes witth py3.10")
-     def testClipping(self):
-         """Test clipping of large arrays"""
-         self.aw.show()