Skip to content

Commit

Permalink
Merge pull request #24 from jayvdb/commons-update
Browse files Browse the repository at this point in the history
Update from commons
  • Loading branch information
chfw committed May 10, 2016
2 parents 33a9885 + 3a9e407 commit 5dfd669
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 18 deletions.
8 changes: 0 additions & 8 deletions .moban.d/travis.yml
Original file line number Diff line number Diff line change
@@ -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%}
2 changes: 2 additions & 0 deletions .moban.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
sudo: false
language: python

notifications:
email: false

python:
- pypy
- 2.6
Expand All @@ -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
codecov
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
'tabulate>=0.7.4',
]

EXTRAS_REQUIRE = {}
EXTRAS_REQUIRE = {
}

CLASSIFIERS = [
'Topic :: Office/Business',
Expand Down Expand Up @@ -81,4 +82,4 @@ def read(afile):
tests_require=['nose'],
license=LICENSE,
classifiers=CLASSIFIERS
)
)
3 changes: 2 additions & 1 deletion test.bat
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
nose
nose-cov
codecov
coverage
pyexcel

0 comments on commit 5dfd669

Please sign in to comment.