sync with commons

Author: chfw

README.rst

@@ -276,7 +276,7 @@ Development steps for code changes
 
 Upgrade your setup tools and pip. They are needed for development and testing only:
 
-#. pip install --upgrade setuptools "pip==7.1"
+#. pip install --upgrade setuptools pip
 
 Then install relevant development requirements:
 
@@ -285,7 +285,7 @@ Then install relevant development requirements:
 #. pip install -r tests/requirements.txt
 
 
-In order to update test environment, and documentation, additional setps are
+In order to update test environment, and documentation, additional steps are
 required:
 
 #. pip install moban
@@ -314,7 +314,7 @@ Although `nose` and `doctest` are both used in code testing, it is adviable that
 
 On Linux/Unix systems, please launch your tests like this::
 
-    $ make test
+    $ make
 
 On Windows systems, please issue this command::
 

docs/source/conf.py

@@ -1,4 +1,9 @@
 # -*- coding: utf-8 -*-
+DESCRIPTION = (
+    'A wrapper library to read, manipulate and write data in xls format. It' +
+    ' reads xlsx and xlsm format' +
+    ''
+)
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
@@ -25,15 +30,19 @@
 htmlhelp_basename = 'pyexcel-xlsdoc'
 latex_elements = {}
 latex_documents = [
-    ('index', 'pyexcel-xls.tex', u'pyexcel-xls Documentation',
+    ('index', 'pyexcel-xls.tex',
+     'pyexcel-xls Documentation',
      'Onni Software Ltd.', 'manual'),
 ]
 man_pages = [
-    ('index', 'pyexcel-xls', u'pyexcel-xls Documentation',
+    ('index', 'pyexcel-xls',
+     'pyexcel-xls Documentation',
      [u'Onni Software Ltd.'], 1)
 ]
 texinfo_documents = [
-    ('index', 'pyexcel-xls', u'pyexcel-xls Documentation',
-     'Onni Software Ltd.', 'pyexcel-xls', 'One line description of project.',
+    ('index', 'pyexcel-xls',
+     'pyexcel-xls Documentation',
+     'Onni Software Ltd.', 'pyexcel-xls',
+     DESCRIPTION,
      'Miscellaneous'),
 ]

test.bat

@@ -1,4 +1,2 @@
-
-
 pip freeze
-nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst docs/source pyexcel_xls && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
+nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_xls && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long

test.sh

@@ -1,4 +1,2 @@
-
-
 pip freeze
-nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst docs/source pyexcel_xls && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
+nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_xls && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long

tests/base.py

@@ -1,7 +1,7 @@
-import os # noqa
+import os  # noqa
 import pyexcel
-import datetime # noqa
-from nose.tools import raises, eq_ # noqa
+import datetime  # noqa
+from nose.tools import raises, eq_  # noqa
 
 
 def create_sample_file1(file):

tests/test_formatters.py

@@ -16,7 +16,8 @@ def test_reading_date_format(self):
         """
         import datetime
         r = pe.get_sheet(file_name=os.path.join("tests", "fixtures",
-                                                "date_field.xls"))
+                                                "date_field.xls"),
+                         library='pyexcel-xls')
         assert isinstance(r[1, 0], datetime.date) is True
         assert r[1, 0].strftime("%d/%m/%y") == "25/12/14"
         assert isinstance(r[1, 1], datetime.time) is True
@@ -31,7 +32,7 @@ def test_writing_date_format(self):
                 datetime.time(11, 11, 11),
                 datetime.datetime(2014, 12, 25, 11, 11, 11)]]
         pe.save_as(dest_file_name=excel_filename, array=data)
-        r = pe.get_sheet(file_name=excel_filename)
+        r = pe.get_sheet(file_name=excel_filename, library='pyexcel-xls')
         assert isinstance(r[0, 0], datetime.date) is True
         assert r[0, 0].strftime("%d/%m/%y") == "25/12/14"
         assert isinstance(r[0, 1], datetime.time) is True