summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2016-09-05 13:06:45 +0200
committerGitHub <noreply@github.com>2016-09-05 13:06:45 +0200
commit8e4271af8f9d36a4f3ad11377d2b2379aa2f5015 (patch)
treed43546eddbb6d20ac6ed39f8859f2ffabbb705ec
parent88b4b645a8172d2381a15d40ff2fc40305d95675 (diff)
parent0ca7020f6e128de8343507f14b99601eed11d267 (diff)
downloadbottle-8e4271af8f9d36a4f3ad11377d2b2379aa2f5015.tar.gz
Merge pull request #885 from oz123/enable_coveralls
Enable coveralls
-rw-r--r--.travis.yml6
-rw-r--r--README.rst4
-rw-r--r--circle.yml26
3 files changed, 9 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml
index 8b9fbfd..91828b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: python
+sudo: required
python:
- "2.7.3" # Ubuntu 12.4LTS (precise) and Debian 7 LTS (wheezy)
@@ -16,9 +17,12 @@ install:
# Coveralls 4.0 doesn't support Python 3.2
- if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
- if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi
+ - pip install coveralls
script:
- - python test/testall.py fast
+ - coverage run --source=bottle.py test/testall.py
+ - coverage combine
+ - coverage report 2>&1
notifications:
irc: "irc.freenode.org#bottlepy"
diff --git a/README.rst b/README.rst
index e506a05..ef95b59 100644
--- a/README.rst
+++ b/README.rst
@@ -7,6 +7,10 @@
:target: https://travis-ci.org/bottlepy/bottle
:alt: Bottle Build
+.. image:: https://coveralls.io/repos/github/bottlepy/bottle/badge.svg?branch=master
+ :target: https://coveralls.io/github/bottlepy/bottle?branch=master
+ :alt: Coverage
+
.. image:: https://img.shields.io/pypi/dm/bottle.svg
:target: https://pypi.python.org/pypi/bottle/
:alt: Downloads
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 200645a..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-test:
- override:
- - pyenv versions
- - pyenv shell 2.7.3; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.4; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.5; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.6; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.7; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.8; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.9; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 2.7.10; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.1.5; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.2; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.2.5; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.3.0; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.3.2; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.3.3; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.4.0; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.4.1; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.4.2; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.4.3; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell 3.5.0; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell pypy-2.2.1; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell pypy-2.3.1; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell pypy-2.4.0; eval "$(pyenv init -)"; python --version; python test/testall.py
- - pyenv shell pypy-2.5.0; eval "$(pyenv init -)"; python --version; python test/testall.py