Skip to content

Commit d84d8f9

Browse files
committed
BF: for version comparison first arg should be the LooseVersion
also enhanced skip test msg a bit
1 parent c6bcc99 commit d84d8f9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pandas/io/tests/test_excel.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1478,8 +1478,8 @@ def setUpClass(cls):
14781478
_skip_if_no_openpyxl()
14791479
import openpyxl
14801480
ver = openpyxl.__version__
1481-
if not (ver >= LooseVersion('2.0.0') and ver < LooseVersion('2.2.0')):
1482-
raise nose.SkipTest("openpyxl >= 2.2")
1481+
if not (LooseVersion(ver) >= LooseVersion('2.0.0') and LooseVersion(ver) < LooseVersion('2.2.0')):
1482+
raise nose.SkipTest("openpyxl %s >= 2.2" % str(ver))
14831483

14841484
cls.setUpClass = setUpClass
14851485
return cls
@@ -1593,8 +1593,8 @@ def setUpClass(cls):
15931593
_skip_if_no_openpyxl()
15941594
import openpyxl
15951595
ver = openpyxl.__version__
1596-
if ver < LooseVersion('2.2.0'):
1597-
raise nose.SkipTest("openpyxl < 2.2")
1596+
if LooseVersion(ver) < LooseVersion('2.2.0'):
1597+
raise nose.SkipTest("openpyxl %s < 2.2" % str(ver))
15981598

15991599
cls.setUpClass = setUpClass
16001600
return cls

0 commit comments

Comments
 (0)