Skip to content

Commit

Permalink
Disable clean/report with nose (the coverage plugin seems broken ther…
Browse files Browse the repository at this point in the history
…e, so stuff can't be merged).
  • Loading branch information
ionelmc committed Jul 27, 2016
1 parent 506c478 commit 3332b2a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 4 additions & 6 deletions {{cookiecutter.repo_name}}/ci/templates/tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{% raw -%}
[tox]
envlist =
clean,
check,
{% for env in tox_environments|sort %}
{% if cookiecutter.test_runner|lower == "pytest" %}check,{% endif %}
{% raw %}{% for env in tox_environments|sort %}
{{ env }},
{% endfor %}
report,
{% endfor %}{% endraw %}
{% if cookiecutter.test_runner|lower == "pytest" %}report,{% endif %}
docs

[testenv]
Expand All @@ -19,7 +18,6 @@ setenv =
passenv =
*
deps =
{%- endraw -%}
{%- if cookiecutter.test_runner|lower == "pytest" %}
pytest
pytest-travis-fold
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.repo_name}}/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ passenv =

[tox]
envlist =
clean,
{% if cookiecutter.test_runner|lower == "pytest" %}clean,{% endif %}
check,
{py27,py33,py34,py35,pypy}{% if cookiecutter.test_matrix_separate_coverage == 'yes' %}-{cover,nocov}{% endif %},
report,
{% if cookiecutter.test_runner|lower == "pytest" %}report,{% endif %}
docs

[testenv]
Expand Down

0 comments on commit 3332b2a

Please sign in to comment.