Commits

Anonymous committed 8770beb

Change to use source option in coverage 3.4

Comments (0)

Files changed (2)

 The remaining three reports output to files without showing anything on the terminal (useful for
 when the output is going to a continuous integration server)::
 
-    py.test --cov-report html --cov-report xml --cov-report annotate --cov myproj tests/
+    py.test --cov-report html
+            --cov-report xml
+            --cov-report annotate
+            --cov myproj tests/
 
 
 Coverage Data File
 Acknowledgements
 ----------------
 
-Holger Krekel for pytest with its distributed testing support.
+Whilst this plugin has been built fresh from the ground up it has been influenced by the work done
+on pytest-coverage (Ross Lawley, James Mills, Holger Krekel) and nose-cover (Jason Pellerin) which are
+other coverage plugins.
 
 Ned Batchelder for coverage and its ability to combine the coverage results of parallel runs.
 
-Whilst this plugin has been built fresh from the ground up to support distributed testing it has
-been influenced by the work done on pytest-coverage (Ross Lawley, James Mills, Holger Krekel) and
-nose-cover (Jason Pellerin) which are other coverage plugins for pytest and nose respectively.
+Holger Krekel for pytest with its distributed testing support.
+
+Jason Pellerin for nose.
+
+Michael Foord for unittest2.
 
 No doubt others have contributed to these tools as well.
 """
     def pytest_funcarg__cov(self, request):
         """A pytest funcarg that provide access to the underlying coverage object."""
 
-        return self.cov_controller.cov if self.cov_controller else None
+        if self.cov_controller:
+            return self.cov_controller.cov
+        else:
+            return None
 import setuptools
 
 setuptools.setup(name='pytest-cov',
-                 version='1.2',
+                 version='1.3',
                  description='py.test plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses',
                  long_description=open('README.txt').read().strip(),
                  author='Meme Dough',
                  author_email='memedough@gmail.com',
                  url='http://bitbucket.org/memedough/pytest-cov/overview',
                  py_modules=['pytest_cov'],
-                 install_requires=['py>=1.3.3',
+                 install_requires=['py>=1.3.4',
                                    'pytest-xdist>=1.4',
-                                   'cov-core>=1.1'],
+                                   'cov-core>=1.2'],
                  entry_points={'pytest11': ['pytest_cov = pytest_cov']},
                  license='MIT License',
                  zip_safe=False,