mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-25 17:36:18 +03:00
More specific version of pr #2083
This commit is contained in:
parent
67eb7a3dc2
commit
30abb42c27
|
@ -15,8 +15,13 @@ except ImportError:
|
|||
|
||||
TEST_IMAGE_SIZE = (10, 10)
|
||||
|
||||
@unittest.skipIf(hasattr(sys, 'pypy_version_info'),
|
||||
"numpy is flaky on PyPy")
|
||||
# Numpy on pypy as of pypy 5.3.1 is corrupting the numpy.array(Image)
|
||||
# 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):
|
||||
|
||||
def setUp(self):
|
||||
|
@ -115,6 +120,7 @@ class TestNumpy(PillowTestCase):
|
|||
for y in range(0, img.size[1], int(img.size[1]/10)):
|
||||
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):
|
||||
img = Image.open('Tests/images/16bit.cropped.tif')
|
||||
np_img = numpy.array(img)
|
||||
|
@ -136,6 +142,7 @@ class TestNumpy(PillowTestCase):
|
|||
im_good = Image.open(filename)
|
||||
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 _to_array(mode, dtype):
|
||||
|
|
Loading…
Reference in New Issue
Block a user