mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-27 02:16:19 +03:00
Merge pull request #2771 from cgohlke/patch-1
Fix ValueError: invalid version number '1.0.0rc1'
This commit is contained in:
commit
74d4940954
|
@ -1,5 +1,5 @@
|
||||||
from helper import unittest, PillowTestCase
|
from helper import unittest, PillowTestCase
|
||||||
from distutils.version import StrictVersion
|
from distutils.version import LooseVersion
|
||||||
try:
|
try:
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from numpy.testing import assert_equal
|
from numpy.testing import assert_equal
|
||||||
|
@ -31,7 +31,7 @@ class Test_scipy_resize(PillowTestCase):
|
||||||
# this test fails prior to scipy 0.14.0b1
|
# this test fails prior to scipy 0.14.0b1
|
||||||
# https://github.com/scipy/scipy/commit/855ff1fff805fb91840cf36b7082d18565fc8352
|
# https://github.com/scipy/scipy/commit/855ff1fff805fb91840cf36b7082d18565fc8352
|
||||||
@unittest.skipIf(HAS_SCIPY and
|
@unittest.skipIf(HAS_SCIPY and
|
||||||
(StrictVersion(scipy.__version__) < StrictVersion('0.14.0')),
|
(LooseVersion(scipy.__version__) < LooseVersion('0.14.0')),
|
||||||
"Test fails on scipy < 0.14.0")
|
"Test fails on scipy < 0.14.0")
|
||||||
def test_imresize4(self):
|
def test_imresize4(self):
|
||||||
im = np.array([[1, 2],
|
im = np.array([[1, 2],
|
||||||
|
|
Loading…
Reference in New Issue
Block a user