]> 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:

Remove regex dependency (GH-2663)
[etc/vim.git] / tox.ini
diff --git a/tox.ini b/tox.ini
index a97d18946b3b8cb3e71fe484e2cb78dfa1fd6d36..683a5439ea98e755b27b42cf0bfeda28bac13ab2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
 [tox]
-envlist = {,ci-}py{36,37,38,39},fuzz
+envlist = {,ci-}py{36,37,38,39,310,py3},fuzz
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
@@ -16,12 +16,44 @@ commands =
     pip install -e .[d]
     coverage erase
     pytest tests --run-optional no_python2 \
     pip install -e .[d]
     coverage erase
     pytest tests --run-optional no_python2 \
+        --run-optional no_jupyter \
         !ci: --numprocesses auto \
         --cov {posargs}
     pip install -e .[d,python2]
     pytest tests --run-optional python2 \
         !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}
         !ci: --numprocesses auto \
         --cov --cov-append {posargs}
+    pip install -e .[jupyter]
+    pytest tests --run-optional jupyter \
+        -m jupyter \
+        !ci: --numprocesses auto \
+        --cov --cov-append {posargs}
+    coverage report
+
+[testenv:{,ci-}pypy3]
+setenv = PYTHONPATH = {toxinidir}/src
+skip_install = True
+recreate = True
+deps =
+    -r{toxinidir}/test_requirements.txt
+; a separate worker is required in ci due to https://foss.heptapod.net/pypy/pypy/-/issues/3317
+; this seems to cause tox to wait forever
+; remove this when pypy releases the bugfix
+commands =
+    pip install -e .[d]
+    coverage erase
+    pytest tests --run-optional no_python2 \
+        --run-optional no_jupyter \
+        !ci: --numprocesses auto \
+        ci: --numprocesses 1 \
+        --cov {posargs}
+    pip install -e .[jupyter]
+    pytest tests --run-optional jupyter \
+        -m jupyter \
+        !ci: --numprocesses auto \
+        ci: --numprocesses 1 \
+        --cov --cov-append {posargs}
     coverage report
 
 [testenv:fuzz]
     coverage report
 
 [testenv:fuzz]