Skip to content

Commit d5959fe

Browse files
committed
Merge pull request #5 from fuhrysteve/master
Fix versioning in unit tests. Thanks and credit go to @fuhrysteve
2 parents 59efa1d + e1fe180 commit d5959fe

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.pyc
22
*~
3+
.coverage
4+
tests/tmp.db

.travis.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@ python:
88
- 2.7
99
- 3.3
1010
- 3.4
11+
- 3.5
1112
install:
12-
- pip install git+https://github.com/chfw/pyexcel-io.git
13-
- pip install git+https://github.com/chfw/pyexcel.git
14-
- pip install git+https://github.com/chfw/pyexcel-webio.git
15-
- pip install git+https://github.com/chfw/pyexcel-xls.git
16-
- pip install git+https://github.com/chfw/pyexcel-xlsx.git
17-
- pip install git+https://github.com/T0ha/ezodf.git
1813
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi
19-
- pip install git+https://github.com/chfw/pyexcel-ods3.git
20-
- pip install -r tests/requirements.txt --use-mirrors
14+
- pip install -r tests/requirements.txt
2115
script:
2216
make test
2317
after_success:

setup.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
'pyexcel-webio>=0.0.3',
1414
'Flask>=0.10.1'
1515
]
16+
extras = {
17+
'xls': ['pyexcel-xls>=0.0.7'],
18+
'xlsx': ['pyexcel-xlsx>=0.0.7'],
19+
'ods3': [
20+
'pyexcel-ods3>=0.0.8',
21+
'https://github.com/T0ha/ezodf/archive/2c69103e6c0715adb0e36562cb2e6325fd776112.zip',
22+
],
23+
}
1624

1725
setup(
1826
name='Flask-Excel',
@@ -22,6 +30,7 @@
2230
url="https://github.com/chfw/Flask-Excel",
2331
description='A flask extension that provides one application programming interface to read and write data in different excel file formats',
2432
install_requires=dependencies,
33+
extras_require=extras,
2534
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
2635
include_package_data=True,
2736
long_description=README_txt,

tests/requirements.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ rednose
55
nose-cov
66
python-coveralls
77
coverage
8-
pyexcel-xls
9-
pyexcel-xlsx
8+
pyexcel>=0.1.7
9+
pyexcel-io>=0.0.8
10+
pyexcel-ods3>=0.0.8
11+
pyexcel-webio>=0.0.3
12+
pyexcel-xls>=0.0.7
13+
pyexcel-xlsx>=0.0.7
14+
https://github.com/T0ha/ezodf/archive/2c69103e6c0715adb0e36562cb2e6325fd776112.zip
1015
lxml

0 commit comments

Comments
 (0)