From d84d8f9399e2a86ebaa972d7dbcbc85043b3fb62 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 22 Sep 2015 12:23:33 -0400 Subject: [PATCH] BF: for version comparison first arg should be the LooseVersion also enhanced skip test msg a bit --- pandas/io/tests/test_excel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/io/tests/test_excel.py b/pandas/io/tests/test_excel.py index 657789fe8ce9b..d44ce24cbefbc 100644 --- a/pandas/io/tests/test_excel.py +++ b/pandas/io/tests/test_excel.py @@ -1478,8 +1478,8 @@ def setUpClass(cls): _skip_if_no_openpyxl() import openpyxl ver = openpyxl.__version__ - if not (ver >= LooseVersion('2.0.0') and ver < LooseVersion('2.2.0')): - raise nose.SkipTest("openpyxl >= 2.2") + if not (LooseVersion(ver) >= LooseVersion('2.0.0') and LooseVersion(ver) < LooseVersion('2.2.0')): + raise nose.SkipTest("openpyxl %s >= 2.2" % str(ver)) cls.setUpClass = setUpClass return cls @@ -1593,8 +1593,8 @@ def setUpClass(cls): _skip_if_no_openpyxl() import openpyxl ver = openpyxl.__version__ - if ver < LooseVersion('2.2.0'): - raise nose.SkipTest("openpyxl < 2.2") + if LooseVersion(ver) < LooseVersion('2.2.0'): + raise nose.SkipTest("openpyxl %s < 2.2" % str(ver)) cls.setUpClass = setUpClass return cls