summaryrefslogtreecommitdiff
path: root/silx/math/test/test_combo.py
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@debian.org>2017-11-25 16:55:20 +0100
committerPicca Frédéric-Emmanuel <picca@debian.org>2017-11-25 16:55:20 +0100
commite19c96eff0c310c06c4f268c8b80cb33bd08996f (patch)
treef2b4a365ed899be04766f3937bcc2d58d22be065 /silx/math/test/test_combo.py
parentbfa4dba15485b4192f8bbe13345e9658c97ecf76 (diff)
New upstream version 0.6.1+dfsg
Diffstat (limited to 'silx/math/test/test_combo.py')
-rw-r--r--silx/math/test/test_combo.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/silx/math/test/test_combo.py b/silx/math/test/test_combo.py
index b985cbd..7698e78 100644
--- a/silx/math/test/test_combo.py
+++ b/silx/math/test/test_combo.py
@@ -27,7 +27,7 @@ from __future__ import division
__authors__ = ["T. Vincent"]
__license__ = "MIT"
-__date__ = "20/12/2016"
+__date__ = "19/10/2017"
import unittest
@@ -43,7 +43,9 @@ class TestMinMax(ParametricTestCase):
"""Tests of min max combo"""
FLOATING_DTYPES = 'float32', 'float64'
- SIGNED_INT_DTYPES = 'uint8', 'uint16', 'uint32', 'uint64'
+ if hasattr(numpy, "float128"):
+ FLOATING_DTYPES += ('float128',)
+ SIGNED_INT_DTYPES = 'int8', 'int16', 'int32', 'int64'
UNSIGNED_INT_DTYPES = 'uint8', 'uint16', 'uint32', 'uint64'
DTYPES = FLOATING_DTYPES + SIGNED_INT_DTYPES + UNSIGNED_INT_DTYPES