Skip to content

Commit 055b7a3

Browse files
committed
added patch changeset_d84d8f9399e2a86ebaa972d7dbcbc85043b3fb62.diff to "cherry-pick" d84d8f9 (BF: for version comparison first arg should be the LooseVersion)
1 parent fa35488 commit 055b7a3

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From: Yaroslav Halchenko <[email protected]>
2+
Subject: BF: for version comparison first arg should be the LooseVersion
3+
also enhanced skip test msg a bit
4+
5+
--- a/pandas/io/tests/test_excel.py
6+
+++ b/pandas/io/tests/test_excel.py
7+
@@ -1478,8 +1478,8 @@ def skip_openpyxl_gt21(cls):
8+
_skip_if_no_openpyxl()
9+
import openpyxl
10+
ver = openpyxl.__version__
11+
- if not (ver >= LooseVersion('2.0.0') and ver < LooseVersion('2.2.0')):
12+
- raise nose.SkipTest("openpyxl >= 2.2")
13+
+ if not (LooseVersion(ver) >= LooseVersion('2.0.0') and LooseVersion(ver) < LooseVersion('2.2.0')):
14+
+ raise nose.SkipTest("openpyxl %s >= 2.2" % str(ver))
15+
16+
cls.setUpClass = setUpClass
17+
return cls
18+
@@ -1593,8 +1593,8 @@ def skip_openpyxl_lt22(cls):
19+
_skip_if_no_openpyxl()
20+
import openpyxl
21+
ver = openpyxl.__version__
22+
- if ver < LooseVersion('2.2.0'):
23+
- raise nose.SkipTest("openpyxl < 2.2")
24+
+ if LooseVersion(ver) < LooseVersion('2.2.0'):
25+
+ raise nose.SkipTest("openpyxl %s < 2.2" % str(ver))
26+
27+
cls.setUpClass = setUpClass
28+
return cls

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
changeset_d84d8f9399e2a86ebaa972d7dbcbc85043b3fb62.diff
12
deb_doc_donotoverride_PYTHONPATH
23
deb_skip_test_precision_i386
34
deb_skip_stata_on_bigendians

0 commit comments

Comments
 (0)