downgrade the requirement on setuptools, related to pyexcel/pyexcel-xlsx#9, pyexcel/pyexcel#58

Author: chfw

.moban.d/setup.py

@@ -1,5 +1,8 @@
 {% extends 'setup.py.jj2' %}
 
+{%block platform_block%}
+{%endblock%}
+
 {%block additional_keywords %}
     'xls',
     'xlsx',

.travis.yml

@@ -31,7 +31,7 @@ before_install:
   - 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

README.rst

@@ -18,13 +18,6 @@ Fonts, colors and charts are not supported.
 Installation
 ================================================================================
 
-
-Recently, pyexcel(0.2.2+) and its plugins(0.2.0+) started using newer version of setuptools. Please upgrade your setup tools before install latest pyexcel components:
-
-.. code-block:: bash
-
-    $ pip install --upgrade setuptools
-
 You can install it via pip:
 
 .. code-block:: bash
@@ -284,6 +277,13 @@ Development steps for code changes
 
 #. git clone https://github.com/pyexcel/pyexcel-xls.git
 #. cd pyexcel-xls
+
+Upgrade your setup tools and pip. They are needed for development and testing only:
+
+#. pip install --upgrade setuptools "pip==7.1" 
+
+Then install relevant development requirements:
+
 #. pip install -r rnd_requirements.txt # if such a file exists
 #. pip install -r requirements.txt
 #. pip install -r tests/requirements.txt

docs/source/conf.py

@@ -16,8 +16,8 @@
 
 project = u'pyexcel-xls'
 copyright = u'2015-2016 Onni Software Ltd.'
-version = '0.2.2'
-release = '0.2.1'
+version = '0.2.1'
+release = '0.2.2'
 exclude_patterns = []
 pygments_style = 'sphinx'
 html_theme = 'default'

setup.py

@@ -4,6 +4,9 @@
     from ez_setup import use_setuptools
     use_setuptools()
     from setuptools import setup, find_packages
+import sys
+PY2 = sys.version_info[0] == 2
+PY26 = PY2 and sys.version_info[1] < 7
 
 NAME = 'pyexcel-xls'
 AUTHOR = 'C.W.'
@@ -30,13 +33,12 @@
     'xlrd',
 ]
 
+if PY2:
+    INSTALL_REQUIRES.append('xlwt')
+if not PY2:
+    INSTALL_REQUIRES.append('xlwt-future')
+
 EXTRAS_REQUIRE = {
-    ':python_version<"3"': [
-        'xlwt'
-    ],
-    ':python_version>="3"': [
-        'xlwt-future'
-    ],
 }
 
 CLASSIFIERS = [