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

Add a missing space in Python 2 deprecation (GH-2590)
[etc/vim.git] / tox.ini
diff --git a/tox.ini b/tox.ini
index 3ea4da8eac221e1deea6148d2753d7f2e86f8346..57f41acb3d17a04845dc69c336339f21d3640e2d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,13 @@
 [tox]
 [tox]
-envlist = {,ci-}py{36,37,38,39},fuzz
+envlist = {,ci-}py{36,37,38,39,310},fuzz
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 
 [testenv]
 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.
+# See https://github.com/psf/black/issues/2367.
+recreate = True
 deps =
     -r{toxinidir}/test_requirements.txt
 ; parallelization is disabled on CI because pytest-dev/pytest-xdist#620 occurs too frequently
 deps =
     -r{toxinidir}/test_requirements.txt
 ; parallelization is disabled on CI because pytest-dev/pytest-xdist#620 occurs too frequently
@@ -12,10 +16,17 @@ 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}
+    pip install -e .[jupyter]
+    pytest tests --run-optional jupyter \
+        -m jupyter \
         !ci: --numprocesses auto \
         --cov --cov-append {posargs}
     coverage report
         !ci: --numprocesses auto \
         --cov --cov-append {posargs}
     coverage report