X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=tox.ini;h=838e4916557df3156f6c611622123dae2c4747fe;hp=1ede20043de8c9d3fed54ab69e0c5f72efd81de3;hb=24687ba4e94bcf43bcee1d196c6944303a4402c1;hpb=29041014a531835bf9b6a80ca9d7ed414a929432

diff --git a/tox.ini b/tox.ini
index 1ede200..838e491 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
-# Copyright (c) 2016-2020 mudpy authors. Permission to use, copy,
+# Copyright (c) 2016-2021 mudpy authors. Permission to use, copy,
 # modify, and distribute this software is granted under terms
 # provided in the LICENSE file distributed with this software.
 
 [tox]
-minversion = 3.1
+minversion = 3.18
 envlist = bandit, codespell, dist, docs, flake8, yamllint, selftest_config, py3
 skipsdist = True
 ignore_basepython_conflict = True
@@ -13,10 +13,13 @@ basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 # TODO(fungi) Switch this to "error" and remove env-specific copies once
-# https://review.opendev.org/735433 and https://review.opendev.org/735443
-# merge and appear in a new PBR release
+# https://github.com/pypa/setuptools/issues/2086 is fixed in a new release of
+# Setuptools and the vendored copy in Python 3.8 and later updated with it;
+# also that won't work for Python 3.6 due to the older Setuptools there still
+# calling imp instead of importlib so probably not while we still support 3.6
 setenv =
     PYTHONWARNINGS=default::DeprecationWarning
+    VIRTUALENV_CREATOR=venv
 commands = mudpy_selftest mudpy/tests/fixtures/test_daemon.yaml
 
 [testenv:bandit]
@@ -27,12 +30,9 @@ commands = bandit -r mudpy -x mudpy/tests {posargs}
 usedevelop = False
 
 [testenv:codespell]
-# TODO(fungi) switch to a proper PyPI dep once .codespellrc is supported in a
-# release version, and ratchet down deprecation warnings for it at that point
-#setenv =
-#    PYTHONWARNINGS=error
-#deps = codespell
-deps = git+https://github.com/codespell-project/codespell
+setenv =
+    PYTHONWARNINGS=error
+deps = codespell
 commands = codespell {posargs}
 usedevelop = False
 
@@ -40,7 +40,7 @@ usedevelop = False
 commands = mudpy {posargs}
 
 [testenv:dist]
-whitelist_externals = rm
+allowlist_externals = rm
 deps =
     pbr
     twine
@@ -52,9 +52,7 @@ commands =
 usedevelop = False
 
 [testenv:docs]
-setenv =
-    PYTHONWARNINGS=error
-whitelist_externals = rm
+allowlist_externals = rm
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt