Skip to content

Commit

Permalink
Merge pull request #1950 from kif/1947_numexpr_bad_version
Browse files Browse the repository at this point in the history
Prevent the usage of the broken numexpr
  • Loading branch information
kif authored Sep 15, 2023
2 parents 177f7db + 8e0d2b9 commit 1fd17de
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ci/requirements_appveyor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ h5py
fabio
scipy
matplotlib
numexpr
numexpr != 2.8.6
silx
psutil
2 changes: 1 addition & 1 deletion ci/requirements_gh.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ matplotlib
#mako
#pybind11
#pyopencl
numexpr
numexpr != 2.8.6
silx
psutil
2 changes: 1 addition & 1 deletion ci/requirements_travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ matplotlib
#mako
#pybind11
#pyopencl
numexpr
numexpr != 2.8.6
silx
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies = [
'h5py',
'fabio',
'silx',
'numexpr',
'numexpr != 2.8.6',
'scipy',
'matplotlib'
]
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cython >=0.29.31
fabio
scipy
matplotlib
numexpr
numexpr != 2.8.6
h5py
silx >=1.1
PyOpenGL
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# ###########################################################################*/

__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "14/11/2022"
__date__ = "15/09/2023"
__status__ = "stable"

import io
Expand Down Expand Up @@ -985,7 +985,7 @@ def get_project_configuration(dry_run):
"fabio>=0.5",
"matplotlib",
"scipy",
"numexpr",
"numexpr!=2.8.6",
# for the use of pkg_resources on script launcher
"setuptools<60.0.0",
"silx>=1.1"]
Expand Down

0 comments on commit 1fd17de

Please sign in to comment.