Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Support for coveralls

  • Loading branch information...
commit 60a5c63cb65ff4307232568307b924d2ac2e54a0 1 parent 6a4d729
@ask ask authored
View
10 .coveragerc
@@ -1,8 +1,16 @@
[run]
-branch = True
+branch = 1
+cover_pylib = 0
+omit = kombu.five,kombu.transport.mongodb,kombu.transport.filesystem,
+ kombu.utils.compat,kombu.utils.eventio,
+ kombu.transport.amqplib,kombu.transport.couchdb,
+ kombu.transport.beanstalk,kombu.transport.sqlalchemy*
+ kombu.transport.zookeeper,kombu.transport.zmq,
+ kombu.transport.django*,kombu.transport.pyro
[report]
exclude_lines =
pragma: no cover
for infinity
+omit = */python?.?/*,*/site-packages/*,*/pypy/*
View
19 .travis.yml
@@ -3,5 +3,20 @@ python:
- 2.6
- 2.7
- 3.3
-install: pip install --use-mirrors tox
-script: TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | tr -d .) tox
+ - pypy
+before_install:
+ - |
+ deactivate
+ if python --version |& grep PyPy; then
+ sudo apt-add-repository --yes ppa:pypy/ppa
+ sudo apt-get update
+ sudo apt-get install pypy
+ source ~/virtualenv/pypy/bin/activate
+ fi
+ python --version
+ uname -a
+ lsb_release -a
+ sudo pip install tox
+ script: tox -v -e $TRAVIS_PYTHON_VERSION -- -v
+ after_success:
+ - .tox/$TRAVIS_PYTHON_VERSION/bin/coveralls
View
8 extra/release/jython-run-tests
@@ -1,8 +0,0 @@
-#!/bin/bash
-base=${1:-.}
-nosetests --with-xunit \
- --xunit-file="$base/nosetests.xml"
-# coverage doesn't with with jython
-echo "<coverage />" > "$base/coverage.html"
-mkdir -p "$base/cover"
-touch "$base/cover/index.html"
View
1  funtests/setup.py
@@ -44,7 +44,6 @@ def run(self, *args, **kwargs):
test_suite='nose.collector',
build_requires=[
'nose',
- 'nose-cover3',
'unittest2',
'coverage>=3.0',
'simplejson',
View
3  kombu/log.py
@@ -14,7 +14,8 @@
__all__ = ['LogMixin', 'LOG_LEVELS', 'get_loglevel', 'setup_logging']
try:
- LOG_LEVELS = dict(logging._nameToLevel, **logging._levelToName)
+ LOG_LEVELS = dict(logging._nameToLevel)
+ LOG_LEVELS.update(logging._levelToName)
except AttributeError:
LOG_LEVELS = dict(logging._levelNames)
LOG_LEVELS.setdefault('FATAL', logging.FATAL)
View
1  requirements/test-ci.txt
@@ -1,5 +1,6 @@
boto
coverage>=3.0
+coveralls
redis
PyYAML
msgpack-python>0.2.0 # 0.2.0 dropped 2.5 support
View
1  requirements/test-ci3.txt
@@ -1,4 +1,5 @@
coverage>=3.0
+coveralls
redis
PyYAML
msgpack-python>0.2.0 # 0.2.0 dropped 2.5 support
View
1  requirements/test.txt
@@ -1,4 +1,3 @@
nose
-nose-cover3
unittest2>=0.5.0
mock
View
1  requirements/test3.txt
@@ -1,4 +1,3 @@
setuptools>=0.7
nose
-nose-cover3
mock>=0.7.0
View
18 setup.cfg
@@ -2,24 +2,6 @@
verbosity = 1
detailed-errors = 1
where = kombu/tests
-cover3-branch = 1
-cover3-html = 1
-cover3-package = kombu
-cover3-exclude = kombu
- kombu.five
- kombu.transport.mongodb
- kombu.transport.filesystem
- kombu.utils.compat
- kombu.utils.eventio
- kombu.utils.finalize
- kombu.transport.amqplib
- kombu.transport.couchdb
- kombu.transport.beanstalk
- kombu.transport.sqlalchemy*
- kombu.transport.zookeeper
- kombu.transport.zmq
- kombu.transport.django*
- kombu.transport.pyro
[build_sphinx]
source-dir = docs/
View
35 tox.ini
@@ -1,11 +1,15 @@
[tox]
-envlist = py26,py27,py33,pypy
+envlist =
+ 2.6,
+ 2.7,
+ 3.3,
+ pypy
[testenv]
sitepackages = False
commands = nosetests
-[testenv:py33]
+[testenv:3.3]
basepython = python3.3
deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test3.txt
@@ -13,23 +17,18 @@ deps = -r{toxinidir}/requirements/default.txt
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
pip install -U -r{toxinidir}/requirements/dev.txt
nosetests -vds kombu.tests \
- --with-xunit \
- --xunit-file={toxinidir}/nosetests.xml
+ --with-coverage --cover-inclusive --cover-erase []
-[testenv:py27]
+[testenv:2.7]
basepython = python2.7
deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test.txt
-r{toxinidir}/requirements/test-ci.txt
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
pip install -U -r{toxinidir}/requirements/dev.txt
- nosetests --with-xunit \
- --xunit-file={toxinidir}/nosetests.xml \
- --with-coverage3 --cover3-xml \
- --cover3-html-dir={toxinidir}/cover \
- --cover3-xml-file={toxinidir}/coverage.xml
+ nosetests --with-coverage --cover-inclusive --cover-erase []
-[testenv:py26]
+[testenv:2.6]
basepython = python2.6
deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/py26.txt
@@ -37,11 +36,7 @@ deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test-ci.txt
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
pip install -U -r{toxinidir}/requirements/dev.txt
- nosetests --with-xunit \
- --xunit-file={toxinidir}/nosetests.xml \
- --with-coverage3 --cover3-xml \
- --cover3-html-dir={toxinidir}/cover \
- --cover3-xml-file={toxinidir}/coverage.xml
+ nosetests --with-coverage --cover-inclusive --cover-erase []
[testenv:pypy]
basepython = pypy
@@ -50,11 +45,7 @@ deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test-ci.txt
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
pip install -U -r{toxinidir}/requirements/dev.txt
- nosetests --with-xunit \
- --xunit-file={toxinidir}/nosetests.xml \
- --with-coverage3 --cover3-xml \
- --cover3-html-dir={toxinidir}/cover \
- --cover3-xml-file={toxinidir}/coverage.xml
+ nosetests --with-coverage --cover-inclusive --cover-erase []
[testenv:jython]
basepython = jython
@@ -65,4 +56,4 @@ deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test-ci.txt
commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
pip install -U -r{toxinidir}/requirements/dev.txt
- {toxinidir}/extra/release/jython-run-tests {toxinidir}
+ nosetests --with-coverage --cover-inclusive --cover-erase []
Please sign in to comment.
Something went wrong with that request. Please try again.