From af919cd5bdacfe598a88b6998e2d7c365ed2569c Mon Sep 17 00:00:00 2001
From: Sajith Sasidharan <sajith@hcoop.net>
Date: Mon, 7 Jun 2021 15:35:12 -0400
Subject: [PATCH] Update towncrier in `news` and `draftnews` tox envs

Since `towncrier.toml` is Towncrier's default configuration file,
`--config towncrier.toml` is not strictly necessary.  But being
explict about the configuration file seems to be a good idea.
---
 tox.ini | 53 ++++++++---------------------------------------------
 1 file changed, 8 insertions(+), 45 deletions(-)

diff --git a/tox.ini b/tox.ini
index d33fe2eae..e74959a2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -169,59 +169,22 @@ passenv = TAHOE_LAFS_* PIP_* SUBUNITREPORTER_* USERPROFILE HOMEDRIVE HOMEPATH
 # see comment in [testenv] about "certifi"
 whitelist_externals = mv
 deps =
-     certifi
-     towncrier >= 19.2
+    certifi
+    towncrier==21.3.0
 commands =
-         # With pip >= 10 the existence of pyproject.toml (which we are
-         # required to have to configure towncrier) triggers a "build
-         # isolation" mode which prevents anything from working.  Avoid
-         # triggering that pip behavior by keeping the towncrier configuration
-         # somewhere else and only bringing it in when it's actually needed
-         # (after pip is done).
-         #
-         # Some discussion is available at
-         # https://github.com/pypa/pip/issues/5696
-         #
-         # towncrier post 19.2 (unreleased as of this writing) adds a --config
-         # option that can be used instead of this file shuffling.
-         mv towncrier.pyproject.toml pyproject.toml
-
-         # towncrier 19.2 + works with python2.7
-         python -m towncrier --draft
-
-         # put it back
-         mv pyproject.toml towncrier.pyproject.toml
+    python -m towncrier --draft --config towncrier.toml
 
 [testenv:news]
 passenv = TAHOE_LAFS_* PIP_* SUBUNITREPORTER_* USERPROFILE HOMEDRIVE HOMEPATH
 # see comment in [testenv] about "certifi"
 whitelist_externals = mv
 deps =
-     certifi
-     towncrier >= 19.2
+    certifi
+    towncrier==21.3.0
 commands =
-         # With pip >= 10 the existence of pyproject.toml (which we are
-         # required to have to configure towncrier) triggers a "build
-         # isolation" mode which prevents anything from working.  Avoid
-         # triggering that pip behavior by keeping the towncrier configuration
-         # somewhere else and only bringing it in when it's actually needed
-         # (after pip is done).
-         #
-         # Some discussion is available at
-         # https://github.com/pypa/pip/issues/5696
-         #
-         # towncrier post 19.2 (unreleased as of this writing) adds a --config
-         # option that can be used instead of this file shuffling.
-         mv towncrier.pyproject.toml pyproject.toml
-
-         # towncrier 19.2 + works with python2.7
-         python -m towncrier --yes
-
-         # put it back
-         mv pyproject.toml towncrier.pyproject.toml
-
-         # commit the changes
-         git commit -m "update NEWS.txt for release"
+    python -m towncrier --yes --config towncrier.toml
+    # commit the changes
+    git commit -m "update NEWS.txt for release"
 
 [testenv:deprecations]
 commands =