fix broken build

This commit is contained in:
chfw 2015-02-18 00:19:27 +00:00
parent e796d73eca
commit ad70361365
2 changed files with 11 additions and 6 deletions

View File

@ -10,9 +10,9 @@ python:
- 3.4
- pypy
install:
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
- pip install git+https://github.com/chfw/pyexcel-io.git
- pip install git+https://github.com/chfw/pyexcel.git
- python setup.py install
- pip install -r tests/requirements.txt
script:
make test

View File

@ -2,6 +2,12 @@ from base import PyexcelMultipleSheetBase
import pyexcel
import os
from pyexcel.ext import xls
import sys
if sys.version_info[0] == 2 and sys.version_info[1] < 7:
from ordereddict import OrderedDict
else:
from collections import OrderedDict
class TestXlsNxlsMultipleSheets(PyexcelMultipleSheetBase):
@ -37,11 +43,10 @@ class TestAddBooks:
self.testfile = "multiple1.xls"
self.testfile2 = "multiple2.xls"
self.testfile3 = "multiple3.xls"
self.content = {
"Sheet1": [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]],
"Sheet2": [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]],
"Sheet3": [[u'X', u'Y', u'Z'], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
}
self.content = OrderedDict()
self.content.update({"Sheet1": [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]]})
self.content.update({"Sheet2": [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]})
self.content.update({"Sheet3": [[u'X', u'Y', u'Z'], [1, 4, 7], [2, 5, 8], [3, 6, 9]]})
self._write_test_file(self.testfile)
self._write_test_file(self.testfile2)