Account for += assignment when deciding whether to split string (#2312)

[etc/vim.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 71b02e920c7a23d575130f47d9f242f7d40a4bb9..3ea4da8eac221e1deea6148d2753d7f2e86f8346 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,23 @@
 [tox]
 [tox]

-envlist = py{36,37,38,39},fuzz
+envlist = {,ci-}py{36,37,38,39},fuzz

 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 deps =
     -r{toxinidir}/test_requirements.txt
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 deps =
     -r{toxinidir}/test_requirements.txt

+; parallelization is disabled on CI because pytest-dev/pytest-xdist#620 occurs too frequently
+; local runs can stay parallelized since they aren't rolling the dice so many times as like on CI

 commands =
 commands =

-    pip install -e .[d,python2]
+    pip install -e .[d]

     coverage erase
     coverage erase

-    coverage run -m pytest tests
+    pytest tests --run-optional no_python2 \
+        !ci: --numprocesses auto \
+        --cov {posargs}
+    pip install -e .[d,python2]
+    pytest tests --run-optional python2 \
+        !ci: --numprocesses auto \
+        --cov --cov-append {posargs}

     coverage report
 
 [testenv:fuzz]
     coverage report
 
 [testenv:fuzz]