sync with pyexcel-commons

Author: chfw

CHANGELOG.rst

@@ -1,7 +1,7 @@
 Change log
 ================================================================================
 
-0.2.3 - 04.11.2016
+0.2.3 - 05.11.2016
 --------------------------------------------------------------------------------
 
 Updated

README.rst

@@ -280,7 +280,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==7.1"
 
 Then install relevant development requirements:
 

setup.py

@@ -10,7 +10,6 @@
 VERSION = '0.2.3'
 EMAIL = 'wangc_2011 (at) hotmail.com'
 LICENSE = 'New BSD'
-PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
 DESCRIPTION = (
     'A wrapper library to read, manipulate and write data in xlsx and xlsm ' +
     'format' +
@@ -23,15 +22,6 @@
     'xlsx'
 ]
 
-INSTALL_REQUIRES = [
-    'openpyxl>=2.2.2',
-    'pyexcel-io>=0.2.2',
-]
-
-
-EXTRAS_REQUIRE = {
-}
-
 CLASSIFIERS = [
     'Topic :: Office/Business',
     'Topic :: Utilities',
@@ -47,19 +37,52 @@
     'Programming Language :: Python :: Implementation :: PyPy'
 ]
 
+INSTALL_REQUIRES = [
+    'openpyxl>=2.2.2',
+    'pyexcel-io>=0.2.2',
+]
+
+
+PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
+EXTRAS_REQUIRE = {
+}
+
 
 def read_files(*files):
     """Read files into setup"""
     text = ""
     for single_file in files:
-        text = text + read(single_file) + "\n"
+        content = read(single_file)
+        text = text + content + "\n"
     return text
 
 
 def read(afile):
     """Read a file into setup"""
     with open(afile, 'r') as opened_file:
-        return opened_file.read()
+        content = filter_out_test_code(opened_file)
+        content = "".join(list(content))
+        return content
+
+
+def filter_out_test_code(file_handle):
+    found_test_code = False
+    for line in file_handle.readlines():
+        if line.startswith('.. testcode:'):
+            found_test_code = True
+            continue
+        if found_test_code is True:
+            if line.startswith('  '):
+                continue
+            else:
+                empty_line = line.strip()
+                if len(empty_line) == 0:
+                    continue
+                else:
+                    found_test_code = False
+                    yield line
+        else:
+            yield line
 
 
 if __name__ == '__main__':
@@ -69,14 +92,14 @@ def read(afile):
         version=VERSION,
         author_email=EMAIL,
         description=DESCRIPTION,
-        install_requires=INSTALL_REQUIRES,
+        long_description=read_files('README.rst', 'CHANGELOG.rst'),
+        license=LICENSE,
         keywords=KEYWORDS,
         extras_require=EXTRAS_REQUIRE,
+        tests_require=['nose'],
+        install_requires=INSTALL_REQUIRES,
         packages=PACKAGES,
         include_package_data=True,
-        long_description=read_files('README.rst', 'CHANGELOG.rst'),
         zip_safe=False,
-        tests_require=['nose'],
-        license=LICENSE,
         classifiers=CLASSIFIERS
     )

test.bat

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

test.sh

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