From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 3 Dec 2020 19:31:58 +0000 (+0000)
Subject: Use released codespell
X-Git-Tag: 0.4.0~16
X-Git-Url: https://mudpy.org/gitweb?a=commitdiff_plain;h=7e931fbecad469af11ee336714e711d67f9f84d4;p=mudpy.git

Use released codespell

Now that codespell has cut a release supporting in-repo
configuration, simplify our tox testenv for it accordingly. Also
update the status on the deprecation warnings situation, as the
latest blockers now lie with Setuptools rather than PBR.
---

diff --git a/tox.ini b/tox.ini
index ce59b99..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