Removes nose-cover3 dependency

CONTRIBUTING.rst

@@ -509,7 +509,7 @@ Calculating test coverage
 Code coverage in HTML:
 ::
 
-    $ nosetests --with-coverage3 --cover3-html
+    $ nosetests --with-coverage --cover-html
 
 The coverage output will then be located at
 ``celery/tests/cover/index.html``.
@@ -517,7 +517,7 @@ The coverage output will then be located at
 Code coverage in XML (Cobertura-style):
 ::
 
-    $ nosetests --with-coverage3 --cover3-xml --cover3-xml-file=coverage.xml
+    $ nosetests --with-coverage --cover-xml --cover-xml-file=coverage.xml
 
 The coverage XML output will then be located at ``coverage.xml``
 

celery/tests/__init__.py

@@ -22,7 +22,7 @@ def setup():
         KOMBU_DISABLE_LIMIT_PROTECTION='yes',
     )
 
-    if os.environ.get('COVER_ALL_MODULES') or '--with-coverage3' in sys.argv:
+    if os.environ.get('COVER_ALL_MODULES') or '--with-coverage' in sys.argv:
         from warnings import catch_warnings
         with catch_warnings(record=True):
             import_all_modules()

docs/contributing.rst

@@ -518,7 +518,7 @@ Code coverage in HTML:
 
 .. code-block:: bash
 
-    $ nosetests --with-coverage3 --cover3-html
+    $ nosetests --with-coverage --cover-html
 
 The coverage output will then be located at
 :file:`celery/tests/cover/index.html`.
@@ -527,7 +527,7 @@ Code coverage in XML (Cobertura-style):
 
 .. code-block:: bash
 
-    $ nosetests --with-coverage3 --cover3-xml --cover3-xml-file=coverage.xml
+    $ nosetests --with-coverage --cover-xml --cover-xml-file=coverage.xml
 
 The coverage XML output will then be located at :file:`coverage.xml`
 

pavement.py

@@ -122,7 +122,7 @@ def bump(options):
 def test(options):
     cmd = 'CELERY_LOADER=default nosetests'
     if getattr(options, 'coverage', False):
-        cmd += ' --with-coverage3'
+        cmd += ' --with-coverage'
     if getattr(options, 'verbose', False):
         cmd += ' --verbosity=2'
     sh(cmd)

requirements/test.txt

@@ -1,4 +1,3 @@
 unittest2>=0.5.1
 nose
-nose-cover3
 mock>=1.0.1

requirements/test3.txt

@@ -1,4 +1,3 @@
 nose
-nose-cover3
 # FIXME required by kombu.tests.case
 mock >=1.0.1