diff --git a/.moban.d/README.rst b/.moban.d/README.rst index daed7f0..77607a1 100644 --- a/.moban.d/README.rst +++ b/.moban.d/README.rst @@ -8,7 +8,7 @@ {%endblock%} {%block description%} -**pyexcel-{{file_type}}** is a tiny wrapper library to read, manipulate and write data in {{file_type}} format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel `_. +**pyexcel-{{file_type}}** is a tiny wrapper library to read, manipulate and write data in {{file_type}} format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel `_. {%endblock%} {%block extras %} diff --git a/.moban.d/travis.yml b/.moban.d/travis.yml index 8cc3af5..6e20c4c 100644 --- a/.moban.d/travis.yml +++ b/.moban.d/travis.yml @@ -6,8 +6,26 @@ - pypy {%endblock%} +{%block extra_matrix%} +matrix: + include: + - python: 2.7 + dist: trusty + sudo: required + virtualenv: + system_site_packages: true + addons: + apt: + packages: + - python-xlwt + - python-xlrd + - python-coverage + - python-nose + - python-mock +{%endblock%} + {%block custom_install %} - pip install https://github.com/pyexcel/pyexcel-io/archive/master.zip - pip install https://github.com/pyexcel/pyexcel/archive/master.zip - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi -{%endblock%} \ No newline at end of file +{%endblock%} diff --git a/.travis.yml b/.travis.yml index 39744cb..189c6da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,21 @@ python: - 3.3 - 3.4 - 3.5 +matrix: + include: + - python: 2.7 + dist: trusty + sudo: required + virtualenv: + system_site_packages: true + addons: + apt: + packages: + - python-xlwt + - python-xlrd + - python-coverage + - python-nose + - python-mock before_install: - pip install https://github.com/pyexcel/pyexcel-io/archive/master.zip - pip install https://github.com/pyexcel/pyexcel/archive/master.zip diff --git a/README.rst b/README.rst index 21fabee..6b3366e 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ pyexcel-xls - Let you focus on data, instead of xls format .. image:: https://codecov.io/github/pyexcel/pyexcel-xls/coverage.png :target: https://codecov.io/github/pyexcel/pyexcel-xls -**pyexcel-xls** is a tiny wrapper library to read, manipulate and write data in xls format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel `_. +**pyexcel-xls** is a tiny wrapper library to read, manipulate and write data in xls format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel `_. Known constraints ================== diff --git a/pyexcel_xls.yaml b/pyexcel_xls.yaml index 1ece054..282baa2 100644 --- a/pyexcel_xls.yaml +++ b/pyexcel_xls.yaml @@ -6,6 +6,6 @@ file_type: xls dependencies: - pyexcel-io>=0.1.0 - xlrd - - xlwt-future -description: | - A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format \ No newline at end of file + - xlwt;python_version<"3" + - xlwt-future;python_version>="3" +description: A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format diff --git a/requirements.txt b/requirements.txt index feaef87..f6e79a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ pyexcel-io>=0.1.0 xlrd -xlwt-future +xlwt;python_version<"3" +xlwt-future;python_version>="3" diff --git a/setup.py b/setup.py index 952b1fa..11a6ffe 100644 --- a/setup.py +++ b/setup.py @@ -24,10 +24,15 @@ KEYWORDS = [ INSTALL_REQUIRES = [ 'pyexcel-io>=0.1.0', 'xlrd', - 'xlwt-future', ] EXTRAS_REQUIRE = { + ':python_version<"3"': [ + 'xlwt' + ], + ':python_version>="3"': [ + 'xlwt-future' + ], } CLASSIFIERS = [