From 88b6688fbdaf433ec3ef573707bf4289c4bda184 Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Thu, 18 Oct 2018 15:39:18 +0100 Subject: [PATCH] tox: remove unnecessary 'nocov' factor tox now allows to use exclamation mark to negate an environment factor. --- .travis.yml | 4 ++-- README.rst | 2 +- run-tests.sh | 6 +++--- tox.ini | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca538c3c4..4223e959b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: dist: xenial - python: pypy2.7-5.8.0 # disable coverage.py on pypy because of performance problems - env: TOXENV=pypy-nocov + env: TOXENV=pypy - language: generic os: osx env: TOXENV=py27-cov @@ -37,7 +37,7 @@ matrix: - TOXENV=py3-cov - HOMEBREW_NO_AUTO_UPDATE=1 - env: - - TOXENV=py27-nocov + - TOXENV=py27 - PYENV_VERSION='2.7.6' - PYENV_VERSION_STRING='Python 2.7.6' - PYENV_ROOT=$HOME/.travis-pyenv diff --git a/README.rst b/README.rst index 4e6faa469..57cbc39c1 100644 --- a/README.rst +++ b/README.rst @@ -279,7 +279,7 @@ or the ``TOXENV`` environment variable: .. code:: sh - tox -e py27-nocov + tox -e py27 TOXENV="py36-cov,htmlcov" tox Development Community diff --git a/run-tests.sh b/run-tests.sh index dc363971b..f10c1b01d 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -5,13 +5,13 @@ set -e # Choose python version if test "x$1" = x-3; then - PYTHON=py3-nocov + PYTHON=py3 shift elif test "x$1" = x-2; then - PYTHON=py2-nocov + PYTHON=py2 shift fi -test "x$PYTHON" = x && PYTHON=py-nocov +test "x$PYTHON" = x && PYTHON=py # Find tests FILTERS= diff --git a/tox.ini b/tox.ini index 4aa4d9fe7..63619e3d6 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ extras = commands = # test with or without coverage, passing extra positonal args to pytest cov: coverage run --parallel-mode -m pytest {posargs} - nocov: pytest {posargs} + !cov: pytest {posargs} [testenv:htmlcov] deps =