Merge pull request #5 from fuhrysteve/master

Fix unit tests, thanks and credit go to @fuhrysteve

Author: chfw

.gitignore

@@ -3,4 +3,5 @@
 .coverage
 pyexcel*-info
 build
-dist
+dist
+tmp.db

.travis.yml

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

pyexcel_io/csvbook.py

@@ -237,7 +237,7 @@ def close(self):
         """
         This call close the file handle
         """
-        if not (isinstance(self.f, StringIO) and isinstance(self.f, BytesIO)):
+        if not (isinstance(self.f, StringIO) or isinstance(self.f, BytesIO)):
             self.f.close()
         elif not self.single_sheet_in_book:
             self.f.write("---pyexcel---\r\n")

setup.py

@@ -14,6 +14,11 @@
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     dependencies.append('ordereddict')
 
+extras = {
+    'xls': ['pyexcel-xls>=0.0.7'],
+    'xlsx': ['pyexcel-xlsx>=0.0.7'],
+}
+
 setup(
     name='pyexcel-io',
     author="C. W.",
@@ -22,6 +27,7 @@
     url="https://github.com/chfw/pyexcel-io",
     description='A python library to read and write structured data in csv, zipped csv format and to/from databases',
     install_requires=dependencies,
+    extras_require=extras,
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     include_package_data=True,
     long_description=README_txt,

tests/requirements.txt

@@ -4,4 +4,5 @@ nose-cov
 python-coveralls
 coverage
 SQLAlchemy
-pyexcel-xls
+pyexcel-xls>=0.0.7
+pyexcel>=0.1.7