Skip to content

Commit ba48e6f

Browse files
committed
Merge pull request #5 from jayvdb/use-sid
Allow xlwt on Python 2
2 parents e450170 + b1e5c0f commit ba48e6f

File tree

7 files changed

+47
-8
lines changed

7 files changed

+47
-8
lines changed

.moban.d/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{%endblock%}
99

1010
{%block description%}
11-
**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>`_.
11+
**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>`_.
1212
{%endblock%}
1313

1414
{%block extras %}

.moban.d/travis.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,26 @@
66
- pypy
77
{%endblock%}
88

9+
{%block extra_matrix%}
10+
matrix:
11+
include:
12+
- python: 2.7
13+
dist: trusty
14+
sudo: required
15+
virtualenv:
16+
system_site_packages: true
17+
addons:
18+
apt:
19+
packages:
20+
- python-xlwt
21+
- python-xlrd
22+
- python-coverage
23+
- python-nose
24+
- python-mock
25+
{%endblock%}
26+
927
{%block custom_install %}
1028
- pip install https://github.com/pyexcel/pyexcel-io/archive/master.zip
1129
- pip install https://github.com/pyexcel/pyexcel/archive/master.zip
1230
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
13-
{%endblock%}
31+
{%endblock%}

.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@ python:
1010
- 3.3
1111
- 3.4
1212
- 3.5
13+
matrix:
14+
include:
15+
- python: 2.7
16+
dist: trusty
17+
sudo: required
18+
virtualenv:
19+
system_site_packages: true
20+
addons:
21+
apt:
22+
packages:
23+
- python-xlwt
24+
- python-xlrd
25+
- python-coverage
26+
- python-nose
27+
- python-mock
1328
before_install:
1429
- pip install https://github.com/pyexcel/pyexcel-io/archive/master.zip
1530
- pip install https://github.com/pyexcel/pyexcel/archive/master.zip

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pyexcel-xls - Let you focus on data, instead of xls format
88
.. image:: https://codecov.io/github/pyexcel/pyexcel-xls/coverage.png
99
:target: https://codecov.io/github/pyexcel/pyexcel-xls
1010

11-
**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>`_.
11+
**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>`_.
1212

1313
Known constraints
1414
==================

pyexcel_xls.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ file_type: xls
66
dependencies:
77
- pyexcel-io>=0.1.0
88
- xlrd
9-
- xlwt-future
10-
description: |
11-
A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format
9+
- xlwt;python_version<"3"
10+
- xlwt-future;python_version>="3"
11+
description: A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
pyexcel-io>=0.1.0
22
xlrd
3-
xlwt-future
3+
xlwt;python_version<"3"
4+
xlwt-future;python_version>="3"

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@
2424
INSTALL_REQUIRES = [
2525
'pyexcel-io>=0.1.0',
2626
'xlrd',
27-
'xlwt-future',
2827
]
2928

3029
EXTRAS_REQUIRE = {
30+
':python_version<"3"': [
31+
'xlwt'
32+
],
33+
':python_version>="3"': [
34+
'xlwt-future'
35+
],
3136
}
3237

3338
CLASSIFIERS = [

0 commit comments

Comments
 (0)