require silx2

kif · kif · commit f7eb8a96ef90 · 2024-02-01T16:14:04.000+01:00
diff --git a/ci/requirements_appveyor.txt b/ci/requirements_appveyor.txt
@@ -11,5 +11,5 @@ fabio
 scipy
 matplotlib
 numexpr != 2.8.6
-silx
+silx >= 2
 psutil
diff --git a/ci/requirements_gh.txt b/ci/requirements_gh.txt
@@ -18,5 +18,5 @@ matplotlib
 #pybind11
 #pyopencl
 numexpr != 2.8.6
-silx
+silx >= 2
 psutil
diff --git a/ci/requirements_rtd.txt b/ci/requirements_rtd.txt
@@ -6,7 +6,7 @@ scipy
 cython >=0.29.31
 pygments[plugins]
 sphinxcontrib-programoutput
-silx
+silx >= 2
 nbsphinx
 sphinx-rtd-theme
 docutils<0.20
diff --git a/ci/requirements_travis.txt b/ci/requirements_travis.txt
@@ -16,4 +16,4 @@ matplotlib
 #pybind11
 #pyopencl
 numexpr != 2.8.6
-silx
+silx >= 2
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,8 +42,7 @@ dependencies = [
    'numpy>=1.10',
    'h5py',
    'fabio',
-   "silx>=1.1; python_version < '3.12'",
-   "silx>=2; python_version >= '3.12'",
+   'silx>=2',
    'numexpr != 2.8.6',
    'scipy',
    'matplotlib'
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ scipy
 matplotlib
 numexpr != 2.8.6
 h5py
-silx >=1.1
+silx >= 2
 PyOpenGL
 PyQt5
 hdf5plugin
