Skip to content

Commit c57df68

Browse files
committed
Merge pull request #5860 from jreback/tables_fix
COMPAT: add different numexpr versions for testing / skip encoding tests on too low tables versions
2 parents b3fea8f + 675c823 commit c57df68

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ci/requirements-2.7.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ xlwt==0.7.5
44
numpy==1.8.0
55
cython==0.19.1
66
bottleneck==0.6.0
7-
numexpr==2.1
7+
numexpr==2.0.1
88
tables==2.3.1
99
matplotlib==1.1.1
1010
openpyxl==1.6.2

pandas/io/tests/test_pytables.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,10 @@ def check(format,index):
844844

845845
def test_encoding(self):
846846

847+
if LooseVersion(tables.__version__) < '3.0.0':
848+
raise nose.SkipTest('tables version does not support proper encoding')
847849
if sys.byteorder != 'little':
848-
raise nose.SkipTest('system byteorder is not little, skipping test_encoding!')
850+
raise nose.SkipTest('system byteorder is not little')
849851

850852
with ensure_clean_store(self.path) as store:
851853
df = DataFrame(dict(A='foo',B='bar'),index=range(5))

0 commit comments

Comments
 (0)