Skip to content

Commit

Permalink
Merge aead6b6 into e5c11f1
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed May 27, 2019
2 parents e5c11f1 + aead6b6 commit ccfefdd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
8 changes: 3 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,13 @@ Getting Started
1. Set the current working directory to a ``git`` repository.

2. Run your test suite under coverage and generate a [Cobertura, Clover or JaCoCo] XML report.
For example, if you are using `nosetests`__ and `coverage.py`__:
For example, using `pytest-cov`__:

.. code:: bash
nosetests --with-coverage
coverage xml
pytest --cov --cov-report=xml
__ http://nose.readthedocs.org
__ http://nedbatchelder.com/code/coverage/
__ https://pypi.org/project/pytest-cov

This will create a ``coverage.xml`` file in the current working directory.

Expand Down
3 changes: 1 addition & 2 deletions diff_cover/tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import six
import os.path
import difflib
from nose.tools import ok_

HUNK_BUFFER = 2
MAX_LINE_LENGTH = 300
Expand Down Expand Up @@ -41,7 +40,7 @@ def assert_long_str_equal(expected, actual, strip=False):
)

# Fail the test
ok_(False, '\n\n' + '\n'.join(diff))
assert False, '\n\n' + '\n'.join(diff)


def fixture_path(rel_path):
Expand Down
3 changes: 1 addition & 2 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Common requirements for developing on all supported python versions
mock
nose
coverage
pytest-cov
pycodestyle>=2.4.0
flake8
pyflakes
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ whitelist_externals =
deps =
-r{toxinidir}/requirements/test-requirements.txt
commands =
coverage run -m nose {posargs}
coverage xml
coverage run -m pytest --cov --cov-report=xml {posargs}
git fetch origin master:refs/remotes/origin/master
diff-cover coverage.xml
diff-quality --violation=pycodestyle
Expand Down

0 comments on commit ccfefdd

Please sign in to comment.