Skip to content

Allow xlwt on Python 2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .moban.d/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pyexcel/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 <https://github.com/pyexcel/pyexcel>`_.
{%endblock%}

{%block extras %}
Expand Down
20 changes: 19 additions & 1 deletion .moban.d/travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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%}
{%endblock%}
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pyexcel/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 <https://github.com/pyexcel/pyexcel>`_.

Known constraints
==================
Expand Down
6 changes: 3 additions & 3 deletions pyexcel_xls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- 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
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pyexcel-io>=0.1.0
xlrd
xlwt-future
xlwt;python_version<"3"
xlwt-future;python_version>="3"
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@
INSTALL_REQUIRES = [
'pyexcel-io>=0.1.0',
'xlrd',
'xlwt-future',
]

EXTRAS_REQUIRE = {
':python_version<"3"': [
'xlwt'
],
':python_version>="3"': [
'xlwt-future'
],
}

CLASSIFIERS = [
Expand Down