From cf095352991184f20f17f56a7798674f02686a7f Mon Sep 17 00:00:00 2001
From: chfw <wangc_2011@hotmail.com>
Date: Tue, 13 Jun 2017 22:18:56 +0100
Subject: [PATCH] prepare for release

---
 .travis.yml            |  6 ++++--
 README.rst             | 22 +++++++++++++++-------
 docs/source/conf.py    |  4 ++--
 pyexcel_xlsxw.yml      |  4 ++--
 pyexcel_xlsxw/xlsxw.py |  8 +++++---
 requirements.txt       |  2 +-
 setup.py               |  2 +-
 tests/requirements.txt |  1 +
 8 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6cb106c..5faae77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,13 @@ language: python
 notifications:
   email: false
 python:
+  - pypy
   - 3.6
   - 3.5
   - 3.4
   - 3.3
   - 2.7
   - 2.6
-  - pypy
 matrix:
   include:
     - python: 2.7
@@ -25,13 +25,15 @@ matrix:
             - python-openpyxl
 
 before_install:
+  - cd $HOME
+  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then deactivate && wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2 -O - | tar -jxf - && echo 'Setting up aliases...' && ln -s pypy-5.7.1-linux_x86_64-portable pypy2-latest && export PATH=$HOME/pypy2-latest/bin/:$PATH && virtualenv --no-site-packages --python ~/pypy2-latest/bin/pypy pypy2-env && echo 'Creating custom env...' && source pypy2-env/bin/activate && python -V; fi"
+  - cd -
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
   - pip install --upgrade pip>8 setuptools>21
   - 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"
   - 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
diff --git a/README.rst b/README.rst
index d73de69..489bc9a 100644
--- a/README.rst
+++ b/README.rst
@@ -39,6 +39,21 @@ or clone it and install it:
     $ cd pyexcel-xlsxw
     $ python setup.py install
 
+Support the project
+================================================================================
+
+If your company has embedded pyexcel and its components into a revenue generating
+product, please `support me on patreon <https://www.patreon.com/bePatron?u=5537627>`_ to
+maintain the project and develop it further.
+
+If you are an individual, you are welcome to support me too on patreon and for however long
+you feel like to. As a patreon, you will receive
+`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
+
+With your financial support, I will be able to invest
+a little bit more time in coding, documentation and writing interesting posts.
+
+
 Usage
 ================================================================================
 
@@ -245,10 +260,3 @@ On Windows systems, please issue this command::
    >>> import os
    >>> os.unlink("your_file.xlsx")
    >>> os.unlink("another_file.xlsx")
-
-Support the project
-================================================================================
-
-If your company has embedded pyexcel and its components into a revenue generating
-product, please `support me on patreon <https://www.patreon.com/bePatron?u=5537627>`_ to
-maintain the project and develop it further.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index b41b201..d00d21c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -11,7 +11,7 @@
 ]
 
 intersphinx_mapping = {
-    'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None)
+    'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None),
 }
 spelling_word_list_filename = 'spelling_wordlist.txt'
 templates_path = ['_templates']
@@ -20,7 +20,7 @@
 
 project = u'pyexcel-xlsxw'
 copyright = u'2015-2017 Onni Software Ltd.'
-version = '0.3.2'
+version = '0.4.0'
 release = '0.4.0'
 exclude_patterns = []
 pygments_style = 'sphinx'
diff --git a/pyexcel_xlsxw.yml b/pyexcel_xlsxw.yml
index 3f1a5b9..af1f807 100644
--- a/pyexcel_xlsxw.yml
+++ b/pyexcel_xlsxw.yml
@@ -2,9 +2,9 @@ overrides: "pyexcel.yaml"
 name: "pyexcel-xlsxw"
 nick_name: xlsxw
 version: 0.4.0
-release: 0.3.2
+release: 0.4.0
 file_type: xlsx
 dependencies:
   - XlsxWriter==0.9.3
-  - pyexcel-io>=0.3.0
+  - pyexcel-io>=0.4.0
 description: A wrapper library to write data in xlsx and xlsm format
diff --git a/pyexcel_xlsxw/xlsxw.py b/pyexcel_xlsxw/xlsxw.py
index cb8f8ea..b84836c 100644
--- a/pyexcel_xlsxw/xlsxw.py
+++ b/pyexcel_xlsxw/xlsxw.py
@@ -7,14 +7,15 @@
     :copyright: (c) 2016 by Onni Software Ltd & its contributors
     :license: New BSD License
 """
+import xlsxwriter
+
 from pyexcel_io.book import BookWriter
 from pyexcel_io.sheet import SheetWriter
-import xlsxwriter
 
 
 class XLSXSheetWriter(SheetWriter):
     """
-    xlsx and xlsm sheet writer
+    xlsx sheet writer
     """
     def set_sheet_name(self, name):
         self.current_row = 0
@@ -30,7 +31,7 @@ def write_row(self, array):
 
 class XLSXWriter(BookWriter):
     """
-    xlsx and xlsm writer
+    xlsx writer
     """
     def __init__(self):
         BookWriter.__init__(self)
@@ -66,3 +67,4 @@ def close(self):
         This call actually save the file
         """
         self._native_book.close()
+        self._native_book = None
diff --git a/requirements.txt b/requirements.txt
index 219a2fc..fab702d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 XlsxWriter==0.9.3
-pyexcel-io>=0.3.0
+pyexcel-io>=0.4.0
diff --git a/setup.py b/setup.py
index a49062d..163e694 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@
 
 INSTALL_REQUIRES = [
     'XlsxWriter==0.9.3',
-    'pyexcel-io>=0.3.0',
+    'pyexcel-io>=0.4.0',
 ]
 
 
diff --git a/tests/requirements.txt b/tests/requirements.txt
index f13a9b5..973f2b9 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,5 @@
 nose
+mock;python_version<"3"
 codecov
 coverage
 flake8