From f7eb8a96ef90f04183163a6d288af870db7a4615 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 1 Feb 2024 16:14:04 +0100 Subject: [PATCH] require silx2 --- ci/requirements_appveyor.txt | 2 +- ci/requirements_gh.txt | 2 +- ci/requirements_rtd.txt | 2 +- ci/requirements_travis.txt | 2 +- pyproject.toml | 3 +-- requirements.txt | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ci/requirements_appveyor.txt b/ci/requirements_appveyor.txt index 2d858ba90..c51406ca8 100644 --- 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 index 4405611cf..e37e1405a 100644 --- 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 index 23477d00f..270d6106d 100644 --- 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 index 514031639..35a2f2e19 100644 --- 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 index dc0ba1668..51efd0dc3 100644 --- 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 index 0018f286b..d3a61bc02 100644 --- 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