Skip to content

Commit

Permalink
Bump numpy requirement to 1.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanv committed Jan 28, 2016
1 parent 772dc48 commit 31b6adb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DEPENDS.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Build Requirements
------------------
* `Python >= 2.6 <http://python.org>`__
* `Numpy >= 1.6.1 <http://numpy.scipy.org/>`__
* `Numpy >= 1.7.2 <http://numpy.scipy.org/>`__
* `Cython >= 0.21 <http://www.cython.org/>`__
* `Six >=1.4 <https://pypi.python.org/pypi/six>`__
* `SciPy >=0.9 <http://scipy.org>`__

Runtime requirements
--------------------
* `Python >= 2.6 <http://python.org>`__
* `Numpy >= 1.6.1 <http://numpy.scipy.org/>`__
* `Numpy >= 1.7.2 <http://numpy.scipy.org/>`__
* `SciPy >= 0.9 <http://scipy.org>`__
* `Matplotlib >= 1.1.0 <http://matplotlib.sf.net>`__
* `NetworkX >= 1.8 <https://networkx.github.io>`__
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
matplotlib>=1.1.0
numpy>=1.6.1
numpy>=1.7.2
scipy>=0.9.0
six>=1.4
networkx>=1.8
Expand Down
5 changes: 2 additions & 3 deletions skimage/util/dtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
np.int8, np.int16, np.int32, np.int64,
np.float32, np.float64)

if np.__version__ >= "1.6.0":
dtype_range[np.float16] = (-1, 1)
_supported_types += (np.float16, )
dtype_range[np.float16] = (-1, 1)
_supported_types += (np.float16, )


def dtype_limits(image, clip_negative=True):
Expand Down

0 comments on commit 31b6adb

Please sign in to comment.