Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use pytest instead of py.test per upstream recommendation, #dropthedot #92

Merged
merged 1 commit into from
May 14, 2018
Merged

Use pytest instead of py.test per upstream recommendation, #dropthedot #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/CONTRIBUTING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Tips

To run a subset of tests::

tox -e envname -- py.test -k test_myfeature
tox -e envname -- pytest -k test_myfeature

To run all the test environments in *parallel* (you need to ``pip install detox``)::

Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.repo_name}}/ci/templates/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ commands =
python setup.py clean --all build_ext --force --inplace
{%- endif %}
{%- if cookiecutter.test_runner == "pytest" %}
{posargs:py.test -vv --ignore=src}
{posargs:pytest -vv --ignore=src}
{%- else %}
{posargs:nosetests -v tests}
{%- endif %}
Expand Down Expand Up @@ -162,7 +162,7 @@ commands =
python setup.py clean --all build_ext --force --inplace
{%- endif %}
{%- if cookiecutter.test_runner == "pytest" %}
{posargs:py.test --cov --cov-report=term-missing -vv}
{posargs:pytest --cov --cov-report=term-missing -vv}
{%- else %}
{posargs:nosetests --with-coverage --cover-package={{ cookiecutter.package_name }}}
{%- endif %}
Expand Down
6 changes: 3 additions & 3 deletions {{cookiecutter.repo_name}}/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ commands =
{%- endif %}
{%- if cookiecutter.test_runner == "pytest" %}
{%- if cookiecutter.test_matrix_separate_coverage == 'yes' %}
nocov: {posargs:py.test -vv --ignore=src}
cover: {posargs:py.test --cov --cov-report=term-missing -vv}
nocov: {posargs:pytest -vv --ignore=src}
cover: {posargs:pytest --cov --cov-report=term-missing -vv}
{%- else %}
{posargs:py.test --cov --cov-report=term-missing -vv tests}
{posargs:pytest --cov --cov-report=term-missing -vv tests}
{%- endif %}
{%- else %}
{%- if cookiecutter.test_matrix_separate_coverage == 'yes' %}
Expand Down