From 3a9e4078de6b8b9c4e9613a8ebccdc20ac5c0f3f Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Tue, 10 May 2016 18:24:21 +0700 Subject: [PATCH] Update from commons --- .moban.d/travis.yml | 8 -------- .moban.yml | 2 ++ .travis.yml | 7 ++----- setup.py | 5 +++-- test.bat | 3 ++- test.sh | 2 +- tests/requirements.txt | 1 - 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.moban.d/travis.yml b/.moban.d/travis.yml index 184ae0a..b7b649b 100644 --- a/.moban.d/travis.yml +++ b/.moban.d/travis.yml @@ -1,13 +1,5 @@ {% extends "travis.yml.jj2" %} -{%block test_other_python_versions%} - 2.6 - - pypy - - pypy3 - - 3.3 - - 3.4 - - 3.5 -{%endblock%} - {%block custom_install%} - pip install https://github.com/pyexcel/pyexcel/archive/v0.2.1.zip {%endblock%} diff --git a/.moban.yml b/.moban.yml index 7a02247..fb62eb8 100644 --- a/.moban.yml +++ b/.moban.yml @@ -12,3 +12,5 @@ targets: - LICENSE: LICENSE.jj2 - MANIFEST.in: MANIFEST.in.jj2 - "tests/requirements.txt": "tests/requirements.txt" + - test.sh: test.sh.jj2 + - test.bat: test.sh.jj2 diff --git a/.travis.yml b/.travis.yml index 3fbabe6..9eda875 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ sudo: false language: python - notifications: email: false - python: - pypy - 2.6 @@ -14,10 +12,9 @@ python: - 3.5 before_install: - pip install https://github.com/pyexcel/pyexcel/archive/v0.2.1.zip + - if [[ -f rnd_requirements.txt ]]; then pip install -r rnd_requirements.txt; fi - pip install -r tests/requirements.txt - script: make test - after_success: - codecov \ No newline at end of file + codecov diff --git a/setup.py b/setup.py index 747d9c5..2e5bfd0 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,8 @@ 'tabulate>=0.7.4', ] -EXTRAS_REQUIRE = {} +EXTRAS_REQUIRE = { +} CLASSIFIERS = [ 'Topic :: Office/Business', @@ -81,4 +82,4 @@ def read(afile): tests_require=['nose'], license=LICENSE, classifiers=CLASSIFIERS - ) \ No newline at end of file + ) diff --git a/test.bat b/test.bat index ded75d3..3030358 100644 --- a/test.bat +++ b/test.bat @@ -1 +1,2 @@ -nosetests --with-cov --cov pyexcel_text --cov tests --with-doctest --doctest-extension=.rst +pip freeze +nosetests --with-cov --cover-package pyexcel_text --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst pyexcel_text diff --git a/test.sh b/test.sh index 69ff72d..3030358 100644 --- a/test.sh +++ b/test.sh @@ -1,2 +1,2 @@ pip freeze -nosetests --with-cov --cov pyexcel_text --cov tests --with-doctest --doctest-extension=.rst +nosetests --with-cov --cover-package pyexcel_text --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst pyexcel_text diff --git a/tests/requirements.txt b/tests/requirements.txt index 47f911d..0bfaebe 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,4 @@ nose -nose-cov codecov coverage pyexcel