From e3053d7fb16c4a7c9702be9778a8fbba39d6cc2d Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Fri, 23 Oct 2015 10:15:44 -0400 Subject: [PATCH 1/8] add coverage to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f3d74a9..575c2e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.pyc *~ +.coverage +tests/tmp.db From f393f6df6a940321930d3f8f6ac6409c8178a486 Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Fri, 23 Oct 2015 10:16:12 -0400 Subject: [PATCH 2/8] fix versioning in unit tests --- .travis.yml | 7 ------- tests/requirements.txt | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23ca7e5..df55a1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,7 @@ python: - 3.3 - 3.4 install: - - pip install git+https://github.com/chfw/pyexcel-io.git - - pip install git+https://github.com/chfw/pyexcel.git - - pip install git+https://github.com/chfw/pyexcel-webio.git - - pip install git+https://github.com/chfw/pyexcel-xls.git - - pip install git+https://github.com/chfw/pyexcel-xlsx.git - - pip install git+https://github.com/T0ha/ezodf.git - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi - - pip install git+https://github.com/chfw/pyexcel-ods3.git - pip install -r tests/requirements.txt --use-mirrors script: make test diff --git a/tests/requirements.txt b/tests/requirements.txt index a4d37da..3debb97 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -5,6 +5,11 @@ rednose nose-cov python-coveralls coverage -pyexcel-xls -pyexcel-xlsx +-e git+git@github.com:chfw/pyexcel.git@040cd392ec40069ac1a0f6df755694c8216366d8#egg=pyexcel-master +pyexcel-io==0.0.8 +pyexcel-ods3==0.0.8 +pyexcel-webio==0.0.3 +pyexcel-xls==0.0.7 +pyexcel-xlsx==0.0.7 +-e git+https://github.com/T0ha/ezodf.git@2c69103e6c0715adb0e36562cb2e6325fd776112#egg=ezodf-master lxml From 7264d7697cc4bd9316795dd48138b4ee907d8658 Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Fri, 23 Oct 2015 10:22:59 -0400 Subject: [PATCH 3/8] use https --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3debb97..ac2d63f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -5,7 +5,7 @@ rednose nose-cov python-coveralls coverage --e git+git@github.com:chfw/pyexcel.git@040cd392ec40069ac1a0f6df755694c8216366d8#egg=pyexcel-master +-e git+https://github.com/chfw/pyexcel.git@040cd392ec40069ac1a0f6df755694c8216366d8#egg=pyexcel-master pyexcel-io==0.0.8 pyexcel-ods3==0.0.8 pyexcel-webio==0.0.3 From ffb2f2408b4c12c06eef28a1774e1203a64bcf72 Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Fri, 23 Oct 2015 10:25:25 -0400 Subject: [PATCH 4/8] add python 3.5 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index df55a1a..1a6626f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ python: - 2.7 - 3.3 - 3.4 + - 3.5 install: - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi - pip install -r tests/requirements.txt --use-mirrors From 9296b3b933d6cdeb7a91a8d33f35d2a84c349b5a Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Fri, 23 Oct 2015 10:34:51 -0400 Subject: [PATCH 5/8] add extras --- setup.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/setup.py b/setup.py index 699eb10..640e4ec 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,14 @@ 'pyexcel-webio>=0.0.3', 'Flask>=0.10.1' ] +extras = { + 'xls': ['pyexcel-xls==0.0.7'], + 'xlsx': ['pyexcel-xlsx==0.0.7'], + 'ods3': [ + 'pyexcel-ods3==0.0.8', + 'git+https://github.com/T0ha/ezodf.git@2c69103e6c0715adb0e36562cb2e6325fd776112#egg=ezodf-master', + ], +} setup( name='Flask-Excel', @@ -22,6 +30,7 @@ url="https://github.com/chfw/Flask-Excel", description='A flask extension that provides one application programming interface to read and write data in different excel file formats', install_requires=dependencies, + extras_require=extras, packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, long_description=README_txt, From d55ba01053155c21b3fe9b45bd61842589a9492b Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Fri, 23 Oct 2015 10:37:45 -0400 Subject: [PATCH 6/8] --use-mirrors is apparently removed in python 3.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a6626f..eb5e84d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ python: - 3.5 install: - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi - - pip install -r tests/requirements.txt --use-mirrors + - pip install -r tests/requirements.txt script: make test after_success: From 3d02b3925d97ebd57eb5b7a4fc638150985aaaa7 Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Sun, 25 Oct 2015 13:20:02 -0400 Subject: [PATCH 7/8] use zip for ezodf, be less strict with versions --- tests/requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index ac2d63f..a2cf10d 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -5,11 +5,11 @@ rednose nose-cov python-coveralls coverage --e git+https://github.com/chfw/pyexcel.git@040cd392ec40069ac1a0f6df755694c8216366d8#egg=pyexcel-master -pyexcel-io==0.0.8 -pyexcel-ods3==0.0.8 -pyexcel-webio==0.0.3 -pyexcel-xls==0.0.7 -pyexcel-xlsx==0.0.7 --e git+https://github.com/T0ha/ezodf.git@2c69103e6c0715adb0e36562cb2e6325fd776112#egg=ezodf-master +pyexcel>=0.1.7 +pyexcel-io>=0.0.8 +pyexcel-ods3>=0.0.8 +pyexcel-webio>=0.0.3 +pyexcel-xls>=0.0.7 +pyexcel-xlsx>=0.0.7 +https://github.com/T0ha/ezodf/archive/2c69103e6c0715adb0e36562cb2e6325fd776112.zip lxml From e1fe180c0b1d4522425b22a006fb0b320f98ec35 Mon Sep 17 00:00:00 2001 From: "Stephen J. Fuhry" Date: Sun, 25 Oct 2015 13:22:30 -0400 Subject: [PATCH 8/8] use zip --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 640e4ec..1aa0231 100644 --- a/setup.py +++ b/setup.py @@ -14,11 +14,11 @@ 'Flask>=0.10.1' ] extras = { - 'xls': ['pyexcel-xls==0.0.7'], - 'xlsx': ['pyexcel-xlsx==0.0.7'], + 'xls': ['pyexcel-xls>=0.0.7'], + 'xlsx': ['pyexcel-xlsx>=0.0.7'], 'ods3': [ - 'pyexcel-ods3==0.0.8', - 'git+https://github.com/T0ha/ezodf.git@2c69103e6c0715adb0e36562cb2e6325fd776112#egg=ezodf-master', + 'pyexcel-ods3>=0.0.8', + 'https://github.com/T0ha/ezodf/archive/2c69103e6c0715adb0e36562cb2e6325fd776112.zip', ], }