💚 update broken unit tests

Author: chfw

Diff for: pyexcel-odsr.yml

@@ -11,8 +11,8 @@ dependencies:
 test_dependencies:
   - pyexcel
   - psutil
-  - pyexcel-ods
-  - pyexcel-xls
+  - pyexcel-ods>=0.6.0
+  - pyexcel-xls>=0.6.0
 keywords:
   - excel
   - ods

Diff for: tests/requirements.txt

@@ -11,5 +11,5 @@ moban
 moban_jinja2_github
 pyexcel
 psutil
-pyexcel-ods
-pyexcel-xls
+pyexcel-ods>=0.6.0
+pyexcel-xls>=0.6.0

Diff for: tests/test_fods_reader.py

@@ -1,15 +1,16 @@
 import os
 
 from base import ODSCellTypes
+from pyexcel_io.reader import Reader
 
 from pyexcel_odsr.odsr import FODSBook
 
 
 class TestFODSReader(ODSCellTypes):
     def setUp(self):
-        r = FODSBook(
-            os.path.join("tests", "fixtures", "ods_formats.fods"), "fods"
-        )
+        r = Reader("fods")
+        r.reader_class = FODSBook
+        r.open(os.path.join("tests", "fixtures", "ods_formats.fods"))
         self.data = r.read_all()
         for key in self.data.keys():
             self.data[key] = list(self.data[key])
@@ -21,7 +22,9 @@ def setUp(self):
         with open(
             os.path.join("tests", "fixtures", "ods_formats.fods"), "rb"
         ) as f:
-            r = FODSBook(f, "fods")
+            r = Reader("fods")
+            r.reader_class = FODSBook
+            r.open_stream(f)
             self.data = r.read_all()
             for key in self.data.keys():
                 self.data[key] = list(self.data[key])

Diff for: tests/test_ods_reader.py

@@ -2,16 +2,18 @@
 
 from base import ODSCellTypes
 from pyexcel._compact import BytesIO
+from pyexcel_io.reader import Reader
+from pyexcel_io.writer import Writer
 from pyexcel_ods.odsw import ODSWriter
 
 from pyexcel_odsr.odsr import ODSBook
 
 
 class TestODSReader(ODSCellTypes):
     def setUp(self):
-        r = ODSBook(
-            os.path.join("tests", "fixtures", "ods_formats.ods"), "ods"
-        )
+        r = Reader("fods")
+        r.reader_class = ODSBook
+        r.open(os.path.join("tests", "fixtures", "ods_formats.ods"))
         self.data = r.read_all()
         for key in self.data.keys():
             self.data[key] = list(self.data[key])
@@ -23,7 +25,9 @@ def setUp(self):
         with open(
             os.path.join("tests", "fixtures", "ods_formats.ods"), "rb"
         ) as f:
-            r = ODSBook(f, "ods")
+            r = Reader("fods")
+            r.reader_class = ODSBook
+            r.open_stream(f)
             self.data = r.read_all()
             for key in self.data.keys():
                 self.data[key] = list(self.data[key])
@@ -36,7 +40,9 @@ def setUp(self):
             os.path.join("tests", "fixtures", "ods_formats.ods"), "rb"
         ) as f:
             io = BytesIO(f.read())
-            r = ODSBook(io, "ods")
+            r = Reader("fods")
+            r.reader_class = ODSBook
+            r.open_stream(io)
             self.data = r.read_all()
             for key in self.data.keys():
                 self.data[key] = list(self.data[key])
@@ -45,18 +51,22 @@ def setUp(self):
 
 class TestODSWriter(ODSCellTypes):
     def setUp(self):
-        r = ODSBook(
-            os.path.join("tests", "fixtures", "ods_formats.ods"), "ods"
-        )
+        r = Reader("fods")
+        r.reader_class = ODSBook
+        r.open(os.path.join("tests", "fixtures", "ods_formats.ods"))
         self.data1 = r.read_all()
+        r.close()
         self.testfile = "odswriter.ods"
-        w = ODSWriter(self.testfile, "ods")
+        w = Writer("ods")
+        w.writer_class = ODSWriter
+        w.open(self.testfile)
         w.write(self.data1)
         w.close()
-        r2 = ODSBook(self.testfile, "ods")
-        self.data = r2.read_all()
+        r.open(self.testfile)
+        self.data = r.read_all()
         for key in self.data.keys():
             self.data[key] = list(self.data[key])
+        r.close()
 
     def tearDown(self):
         if os.path.exists(self.testfile):