From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sat, 6 Mar 2021 02:05:50 +0000 (+0000)
Subject: Stop using the tox-venv plugin
X-Git-Tag: 0.4.0~13
X-Git-Url: https://mudpy.org/gitweb?a=commitdiff_plain;h=24687ba4e94bcf43bcee1d196c6944303a4402c1;p=mudpy.git

Stop using the tox-venv plugin

The tox-venv plugin is deprecated, now that tox can call the venv
module directly in place of virtualenv. Drop it, stop recommending
it in the documentation, and configure tox to use venv explicitly
instead.
---

diff --git a/doc/source/coder.rst b/doc/source/coder.rst
index e91c464..a148936 100644
--- a/doc/source/coder.rst
+++ b/doc/source/coder.rst
@@ -2,7 +2,7 @@
  coder guide
 =============
 
-.. Copyright (c) 2004-2020 mudpy authors. Permission to use, copy,
+.. Copyright (c) 2004-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.
 
@@ -44,11 +44,9 @@ Basic developer requirements are a POSIX Unix derivative (such as
 Linux), a modern Python 3 interpreter (any of the minor revisions
 mentioned in the ``metadata.classifier`` section of
 :file:`setup.cfg`) and a recent release of the tox_ utility (at least
-the ``tox.minversion`` mentioned in :file:`tox.ini`). The tox-venv_
-plug-in for tox is also recommended.
+the ``tox.minversion`` mentioned in :file:`tox.ini`).
 
 .. _tox: https://tox.readthedocs.io/
-.. _tox-venv: https://pypi.org/project/tox-venv/
 
 application program interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -103,13 +101,13 @@ be fairly similar across most GNU/Linux distributions. For example,
 on Debian 10 (a.k.a. *Buster*) you need to expressly install the
 ``pip`` and ``venv`` modules since they're packaged separately from
 the rest of the Python standard library. Once that's done, you can
-perform local installs of ``tox`` and ``tox-venv`` as a normal
-non-root user. We're also going to install system packages for the
-``git`` revision control toolset and an extensible console-based MUD
-client called ``tf5`` (TinyFugue version 5)::
+perform a local install of ``tox`` as a normal non-root user. We're
+also going to install system packages for the ``git`` revision
+control toolset and an extensible console-based MUD client called
+``tf5`` (TinyFugue version 5)::
 
     sudo apt install git python3-pip python3-venv tf5
-    pip install --user tox tox-venv
+    pip install --user tox
     exit
 
 The reason for exiting is that, if this is the first time you've
diff --git a/tox.ini b/tox.ini
index 4f7b576..838e491 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,4 @@
-# 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.
 
@@ -19,6 +19,7 @@ install_command = pip install {opts} {packages}
 # 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]