common tests are mobanized

Author: chfw

.moban.d/setup.py

@@ -10,11 +10,5 @@
 {%endblock%}
 
 {%block additional_classifiers%}
-    'Development Status :: 3 - Alpha',
-    'Programming Language :: Python :: 2.6',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: Implementation :: PyPy'
 {%endblock%}

.moban.d/tests/base.py

@@ -0,0 +1,4 @@
+{% extends 'tests/base.py.jj2' %}
+
+{%block ods_types%}
+{%endblock%}

.moban.yml

@@ -15,3 +15,8 @@ targets:
   - "tests/requirements.txt": "tests/requirements.txt"
   - test.sh: test.sh.jj2
   - test.bat: test.sh.jj2
+  - "tests/test_filter.py": "tests/test_filter.py.jj2"
+  - "tests/test_formatters.py": "tests/test_formatters.py.jj2"
+  - "tests/test_stringio.py": "tests/test_stringio.py.jj2"
+  - "tests/test_writer.py": "tests/test_writer.py.jj2"
+  - "tests/base.py": "tests/base.py"

.travis.yml

@@ -3,13 +3,13 @@ language: python
 notifications:
   email: false
 python:
-  - pypy
-  - 2.6
-  - 2.7
-  - 3.3
-  - 3.4
-  - 3.5
   - 3.6
+  - 3.5
+  - 3.4
+  - 3.3
+  - 2.7
+  - 2.6
+  - pypy
 matrix:
   include:
     - python: 2.7

README.rst

@@ -39,9 +39,6 @@ Usage
 As a standalone library
 --------------------------------------------------------------------------------
 
-Write to an xls file
-********************************************************************************
-
 .. testcode::
    :hide:
 
@@ -58,6 +55,11 @@ Write to an xls file
     ...     from collections import OrderedDict
 
 
+Write to an xls file
+********************************************************************************
+
+
+
 Here's the sample code to write a dictionary to an xls file:
 
 .. code-block:: python
@@ -68,6 +70,7 @@ Here's the sample code to write a dictionary to an xls file:
     >>> data.update({"Sheet 2": [["row 1", "row 2", "row 3"]]})
     >>> save_data("your_file.xls", data)
 
+
 Read from an xls file
 ********************************************************************************
 
@@ -101,6 +104,7 @@ Here's the sample code to write a dictionary to an xls file:
 
 
 
+
 Read from an xls from memory
 ********************************************************************************
 
@@ -119,6 +123,8 @@ Continue from previous example:
 Pagination feature
 ********************************************************************************
 
+
+
 Let's assume the following file is a huge xls file:
 
 .. code-block:: python
@@ -175,16 +181,6 @@ No longer, explicit import is needed since pyexcel version 0.2.2. Instead,
 this library is auto-loaded. So if you want to read data in xls format,
 installing it is enough.
 
-Any version under pyexcel 0.2.2, you have to keep doing the following:
-
-Import it in your file to enable this plugin:
-
-.. code-block:: python
-
-    from pyexcel.ext import xls
-
-Please note only pyexcel version 0.0.4+ support this.
-
 
 Reading from an xls file
 ********************************************************************************
@@ -194,7 +190,6 @@ Here is the sample code:
 .. code-block:: python
 
     >>> import pyexcel as pe
-    >>> # from pyexcel.ext import xls
     >>> sheet = pe.get_book(file_name="your_file.xls")
     >>> sheet
     Sheet 1:
@@ -265,6 +260,7 @@ You need to pass a StringIO instance to Writer:
     >>> # In reality, you might give it to your http response
     >>> # object for downloading
 
+
 License
 ================================================================================
 

setup.py

@@ -34,12 +34,12 @@
     'Programming Language :: Python',
     'License :: OSI Approved :: BSD License',
     'Intended Audience :: Developers',
-    'Development Status :: 3 - Alpha',
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: Implementation :: PyPy'
 ]
 

tests/base.py

@@ -1,5 +1,7 @@
-import os
+import os # noqa
 import pyexcel
+import datetime # noqa
+from nose.tools import raises, eq_ # noqa
 
 
 def create_sample_file1(file):
@@ -24,7 +26,7 @@ class PyexcelHatWriterBase:
     def test_series_table(self):
         pyexcel.save_as(adict=self.content, dest_file_name=self.testfile)
         r = pyexcel.get_sheet(file_name=self.testfile, name_columns_by_row=0)
-        assert r.dict == self.content
+        eq_(r.dict, self.content)
 
 
 class PyexcelWriterBase:

tests/test_formatters.py

@@ -1,5 +1,4 @@
 import os
-import datetime
 from unittest import TestCase
 from textwrap import dedent
 
@@ -15,6 +14,7 @@ def test_reading_date_format(self):
         01/01/15 13:13:13
         0.0      0.0
         """
+        import datetime
         r = pe.get_sheet(file_name=os.path.join("tests", "fixtures",
                                                 "date_field.xls"))
         assert isinstance(r[1, 0], datetime.date) is True
@@ -25,6 +25,7 @@ def test_reading_date_format(self):
         assert r[4, 1].strftime("%H:%M:%S") == "00:00:00"
 
     def test_writing_date_format(self):
+        import datetime
         excel_filename = "testdateformat.xls"
         data = [[datetime.date(2014, 12, 25),
                 datetime.time(11, 11, 11),

tests/test_stringio.py

@@ -1,21 +1,22 @@
 import os
 import pyexcel
+from nose.tools import eq_
 from base import create_sample_file1
 
 
 class TestStringIO:
 
     def test_xls_stringio(self):
-        xlsfile = "cute.xls"
-        create_sample_file1(xlsfile)
-        with open(xlsfile, "rb") as f:
+        testfile = "cute.xls"
+        create_sample_file1(testfile)
+        with open(testfile, "rb") as f:
             content = f.read()
             r = pyexcel.get_sheet(file_type="xls", file_content=content)
             result = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 1.1, 1]
             actual = list(r.enumerate())
-            assert result == actual
-        if os.path.exists(xlsfile):
-            os.unlink(xlsfile)
+            eq_(result, actual)
+        if os.path.exists(testfile):
+            os.unlink(testfile)
 
     def test_xls_output_stringio(self):
         data = [
@@ -27,4 +28,4 @@ def test_xls_output_stringio(self):
         r = pyexcel.get_sheet(file_type="xls", file_content=io.getvalue())
         result = [1, 2, 3, 4, 5, 6]
         actual = list(r.enumerate())
-        assert result == actual
+        eq_(result, actual)

tests/test_writer.py

@@ -1,21 +1,21 @@
 import os
-from pyexcel_xls.xls import XLSWriter, XLSBook
+from pyexcel_xls.xls import XLSWriter as Writer, XLSBook as Reader
 from base import PyexcelWriterBase, PyexcelHatWriterBase
 
 
-class TestNativeXLWriter:
+class TestNativeXLSWriter:
     def test_write_book(self):
         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.testfile = "xlwriter.xls"
-        writer = XLSWriter()
+        self.testfile = "writer.xls"
+        writer = Writer()
         writer.open(self.testfile)
         writer.write(self.content)
         writer.close()
-        reader = XLSBook()
+        reader = Reader()
         reader.open(self.testfile)
         content = reader.read_all()
         reader.close()
@@ -28,7 +28,7 @@ def tearDown(self):
             os.unlink(self.testfile)
 
 
-class TestXLSnCSVWriter(PyexcelWriterBase):
+class TestxlsnCSVWriter(PyexcelWriterBase):
     def setUp(self):
         self.testfile = "test.xls"
         self.testfile2 = "test.csv"
@@ -40,7 +40,7 @@ def tearDown(self):
             os.unlink(self.testfile2)
 
 
-class TestXLSHatWriter(PyexcelHatWriterBase):
+class TestxlsHatWriter(PyexcelHatWriterBase):
     def setUp(self):
         self.testfile = "test.xls"