sync with commons and use pyexcel 0.3.0

Author: chfw

.moban.d/setup.py

@@ -1,4 +1,11 @@
 {% extends 'setup.py.jj2' %}
+
+{%block platform_block%}
+{%endblock%}
+
+{%block compat_block%}
+{%endblock%}
+
 {%block additional_keywords%}
     'http'
 {%endblock %}

.travis.yml

@@ -9,10 +9,11 @@ python:
   - 3.4
   - 3.5
 before_install:
+  - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
   - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
       mv min_requirements.txt requirements.txt ;
     fi
-  - pip install --upgrade "setuptools" "pip==7.1"
+  - pip install --upgrade setuptools "pip==7.1"
   - test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
   - test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
   - pip install -r tests/requirements.txt

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Change log
 ================================================================================
 
+0.0.8 - unreleased
+--------------------------------------------------------------------------------
+
+Updated
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+#. use pyexcel v0.3.0
+
 0.0.7 - 01.06.2016
 --------------------------------------------------------------------------------
 

docs/source/conf.py

@@ -9,15 +9,15 @@
 intersphinx_mapping = {
     'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None)
 }
-
+spelling_word_list_filename = 'spelling_wordlist.txt'
 templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 
 project = u'pyexcel-webio'
 copyright = u'2015-2016 Onni Software Ltd.'
 version = '0.0.7'
-release = '0.0.7'
+release = '0.0.8'
 exclude_patterns = []
 pygments_style = 'sphinx'
 html_theme = 'default'

pyexcel_webio.yaml

@@ -1,8 +1,9 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-webio"
 nick_name: webio
-version: 0.0.7
+version: 0.0.8
+release: 0.0.7
 dependencies:
-  - pyexcel>=0.2.2
+  - pyexcel>=0.3.0
 description: |
   A generic request and response interface for pyexcel web extensions.

requirements.txt

@@ -1 +1 @@
-pyexcel>=0.2.2
+pyexcel>=0.3.0

setup.py

@@ -7,7 +7,7 @@
 
 NAME = 'pyexcel-webio'
 AUTHOR = 'C.W.'
-VERSION = '0.0.7'
+VERSION = '0.0.8'
 EMAIL = 'wangc_2011 (at) hotmail.com'
 LICENSE = 'New BSD'
 PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
@@ -23,9 +23,10 @@
 ]
 
 INSTALL_REQUIRES = [
-    'pyexcel>=0.2.2',
+    'pyexcel>=0.3.0',
 ]
 
+
 EXTRAS_REQUIRE = {
 }
 
@@ -55,14 +56,37 @@ 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__':

test.bat

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

test.sh

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