Skip to content

Commit ad70361

Browse files
committed
fix broken build
1 parent e796d73 commit ad70361

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ python:
1010
- 3.4
1111
- pypy
1212
install:
13+
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
1314
- pip install git+https://github.com/chfw/pyexcel-io.git
1415
- pip install git+https://github.com/chfw/pyexcel.git
15-
- python setup.py install
1616
- pip install -r tests/requirements.txt
1717
script:
1818
make test

tests/test_mutliple_sheets.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
import pyexcel
33
import os
44
from pyexcel.ext import xls
5+
import sys
6+
7+
if sys.version_info[0] == 2 and sys.version_info[1] < 7:
8+
from ordereddict import OrderedDict
9+
else:
10+
from collections import OrderedDict
511

612

713
class TestXlsNxlsMultipleSheets(PyexcelMultipleSheetBase):
@@ -37,11 +43,10 @@ def setUp(self):
3743
self.testfile = "multiple1.xls"
3844
self.testfile2 = "multiple2.xls"
3945
self.testfile3 = "multiple3.xls"
40-
self.content = {
41-
"Sheet1": [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]],
42-
"Sheet2": [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]],
43-
"Sheet3": [[u'X', u'Y', u'Z'], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
44-
}
46+
self.content = OrderedDict()
47+
self.content.update({"Sheet1": [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]]})
48+
self.content.update({"Sheet2": [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]})
49+
self.content.update({"Sheet3": [[u'X', u'Y', u'Z'], [1, 4, 7], [2, 5, 8], [3, 6, 9]]})
4550
self._write_test_file(self.testfile)
4651
self._write_test_file(self.testfile2)
4752

0 commit comments

Comments
 (0)