X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=tox.ini;h=4f7b576f3f8be476752684e45907843b6b696ebc;hp=da6723b4114f18d5fa42d4fc3ed573f84f4a2787;hb=b6271bdc166aed6d8476d3a4d2bb6fdd39350e2e;hpb=86687f01f1ee31acb004ec91ba6d90059b89d93e

diff --git a/tox.ini b/tox.ini
index da6723b..4f7b576 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,10 @@ 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/752793 and https://review.opendev.org/752794
-# 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
 commands = mudpy_selftest mudpy/tests/fixtures/test_daemon.yaml
@@ -27,12 +29,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,8 +39,6 @@ usedevelop = False
 commands = mudpy {posargs}
 
 [testenv:dist]
-setenv =
-    PYTHONWARNINGS=error
 allowlist_externals = rm
 deps =
     pbr
@@ -54,8 +51,6 @@ commands =
 usedevelop = False
 
 [testenv:docs]
-setenv =
-    PYTHONWARNINGS=error
 allowlist_externals = rm
 deps =
     -r{toxinidir}/requirements.txt