Support for coveralls

11 files changed, 43 insertions, 55 deletions

diff --git a/.coveragerc b/.coveragerc
index 825a2bc7..dce069cc 100644
--- a/.coveragerc
+++ b/.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/*
diff --git a/.travis.yml b/.travis.yml
index 5483b598..19208e58 100644
--- a/.travis.yml
+++ b/.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
diff --git a/extra/release/jython-run-tests b/extra/release/jython-run-tests
deleted file mode 100755
index cd4136c6..00000000
--- a/extra/release/jython-run-tests
+++ /dev/null
@@ -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"
diff --git a/funtests/setup.py b/funtests/setup.py
index 9bea0b97..72f65536 100644
--- a/funtests/setup.py
+++ b/funtests/setup.py
@@ -44,7 +44,6 @@ setup(
     test_suite='nose.collector',
     build_requires=[
         'nose',
-        'nose-cover3',
         'unittest2',
         'coverage>=3.0',
         'simplejson',
diff --git a/kombu/log.py b/kombu/log.py
index 87c06156..6f42bf3a 100644
--- a/kombu/log.py
+++ b/kombu/log.py
@@ -14,7 +14,8 @@ from .utils.functional import maybe_evaluate
 __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)
diff --git a/requirements/test-ci.txt b/requirements/test-ci.txt
index dd580b81..1962309b 100644
--- a/requirements/test-ci.txt
+++ b/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
diff --git a/requirements/test-ci3.txt b/requirements/test-ci3.txt
index fee2cb91..c5617bb8 100644
--- a/requirements/test-ci3.txt
+++ b/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
diff --git a/requirements/test.txt b/requirements/test.txt
index 5cf3124c..f9bd6449 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,4 +1,3 @@
 nose
-nose-cover3
 unittest2>=0.5.0
 mock
diff --git a/requirements/test3.txt b/requirements/test3.txt
index b1721cd3..fdf7c431 100644
--- a/requirements/test3.txt
+++ b/requirements/test3.txt
@@ -1,4 +1,3 @@
 setuptools>=0.7
 nose
-nose-cover3
 mock>=0.7.0
diff --git a/setup.cfg b/setup.cfg
index ff87c228..678e5291 100644
--- a/setup.cfg
+++ b/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/
diff --git a/tox.ini b/tox.ini
index 9ce8b890..ba2c2547 100644
--- a/tox.ini
+++ b/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 []