]> git.madduck.net Git - etc/vim.git/blobdiff - tox.ini

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Formalise style preference description (#2818)
[etc/vim.git] / tox.ini
diff --git a/tox.ini b/tox.ini
index 683a5439ea98e755b27b42cf0bfeda28bac13ab2..090dc522cadb6662fbe561dced34f0ed39304dc2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = {,ci-}py{36,37,38,39,310,py3},fuzz
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 # We use `recreate=True` because otherwise, on the second run of `tox -e py`,
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 # We use `recreate=True` because otherwise, on the second run of `tox -e py`,
-# the `no_python2` tests would run with the Python2 extra dependencies installed.
+# the `no_jupyter` tests would run with the jupyter extra dependencies installed.
 # See https://github.com/psf/black/issues/2367.
 recreate = True
 deps =
 # See https://github.com/psf/black/issues/2367.
 recreate = True
 deps =
@@ -15,15 +15,9 @@ deps =
 commands =
     pip install -e .[d]
     coverage erase
 commands =
     pip install -e .[d]
     coverage erase
-    pytest tests --run-optional no_python2 \
-        --run-optional no_jupyter \
+    pytest tests --run-optional no_jupyter \
         !ci: --numprocesses auto \
         --cov {posargs}
         !ci: --numprocesses auto \
         --cov {posargs}
-    pip install -e .[d,python2]
-    pytest tests --run-optional python2 \
-        --run-optional no_jupyter \
-        !ci: --numprocesses auto \
-        --cov --cov-append {posargs}
     pip install -e .[jupyter]
     pytest tests --run-optional jupyter \
         -m jupyter \
     pip install -e .[jupyter]
     pytest tests --run-optional jupyter \
         -m jupyter \
@@ -43,7 +37,7 @@ deps =
 commands =
     pip install -e .[d]
     coverage erase
 commands =
     pip install -e .[d]
     coverage erase
-    pytest tests --run-optional no_python2 \
+    pytest tests \
         --run-optional no_jupyter \
         !ci: --numprocesses auto \
         ci: --numprocesses 1 \
         --run-optional no_jupyter \
         !ci: --numprocesses auto \
         ci: --numprocesses 1 \