python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-06-01 03:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

More specific version of pr #2083

Browse Source
This commit is contained in:
wiredfool 2016-08-25 03:22:20 -07:00
parent 67eb7a3dc2
commit 30abb42c27
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/test_numpy.py
View File

@ -15,8 +15,13 @@ except ImportError:
TEST_IMAGE_SIZE = (10, 10) TEST_IMAGE_SIZE = (10, 10)
@unittest.skipIf(hasattr(sys, 'pypy_version_info'), # Numpy on pypy as of pypy 5.3.1 is corrupting the numpy.array(Image)
"numpy is flaky on PyPy") # call such that it's returning a object of type numpy.ndarray, but
# the repr is that of a PIL.Image. Size and shape are 1 and (), not the
# size and shape of the array. This causes failures in several tests.
SKIP_NUMPY_ON_PYPY = hasattr(sys, 'pypy_version_info') and (
sys.pypy_version_info <= (5,3,1,'final',0))
class TestNumpy(PillowTestCase): class TestNumpy(PillowTestCase):
def setUp(self): def setUp(self):
@ -115,6 +120,7 @@ class TestNumpy(PillowTestCase):
for y in range(0, img.size[1], int(img.size[1]/10)): for y in range(0, img.size[1], int(img.size[1]/10)):
self.assert_deep_equal(px[x, y], np[y, x]) self.assert_deep_equal(px[x, y], np[y, x])
@unittest.skipIf(SKIP_NUMPY_ON_PYPY, "numpy.array(Image) is flaky on PyPy")
def test_16bit(self): def test_16bit(self):
img = Image.open('Tests/images/16bit.cropped.tif') img = Image.open('Tests/images/16bit.cropped.tif')
np_img = numpy.array(img) np_img = numpy.array(img)
@ -136,6 +142,7 @@ class TestNumpy(PillowTestCase):
im_good = Image.open(filename) im_good = Image.open(filename)
self.assert_image_equal(im_good, im_test) self.assert_image_equal(im_good, im_test)
@unittest.skipIf(SKIP_NUMPY_ON_PYPY, "numpy.array(Image) is flaky on PyPy")
def test_to_array(self): def test_to_array(self):
def _to_array(mode, dtype): def _to_array(mode, dtype):