From 821e6c3d07097f553336e8d5923eeb2ede166bf2 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Mon, 27 Aug 2018 15:25:48 -0600
Subject: [PATCH 1/3] let 'tahoe -e codechecks' run w/o making local changes

---
 newsfragments/2941.bugfix | 1 +
 tox.ini                   | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 newsfragments/2941.bugfix

diff --git a/newsfragments/2941.bugfix b/newsfragments/2941.bugfix
new file mode 100644
index 000000000..049807705
--- /dev/null
+++ b/newsfragments/2941.bugfix
@@ -0,0 +1 @@
+"tox -e codechecks" puts back the local file it mv's while doing code-checks
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index a93178e73..74efb36e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -68,6 +68,10 @@ commands =
 	 # file.  See pyproject.toml for legal <change type> values.
 	 python -m towncrier.check
 
+         # put it back
+	 mv pyproject.toml towncrier.pyproject.toml
+
+
 [testenv:deprecations]
 setenv =
          PYTHONWARNINGS=default::DeprecationWarning

From 55b87b264c4f085e262ba4b1bc0f2f5d9be158d9 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 9 Jan 2020 14:20:33 -0500
Subject: [PATCH 2/3] use --pyproject

---
 tox.ini | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/tox.ini b/tox.ini
index c0feeaaa5..ff5a2d680 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,25 +81,11 @@ commands =
          python misc/coding_tools/find-trailing-spaces.py -r src static misc setup.py
          python misc/coding_tools/check-miscaptures.py
 
-	 # 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
-	 mv towncrier.pyproject.toml pyproject.toml
-
 	 # If towncrier.check fails, you forgot to add a towncrier news
 	 # fragment explaining the change in this branch.  Create one at
 	 # `newsfragments/<ticket>.<change type>` with some text for the news
 	 # file.  See pyproject.toml for legal <change type> values.
-	 python -m towncrier.check
-
-         # put it back
-	 mv pyproject.toml towncrier.pyproject.toml
+	 python -m towncrier.check --pyproject towncrier.pyproject.toml
 
 [testenv:draftnews]
 passenv = TAHOE_LAFS_* PIP_* SUBUNITREPORTER_* USERPROFILE HOMEDRIVE HOMEPATH
@@ -118,6 +104,9 @@ commands =
          #
          # 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

From d4f909f197915b0e4ce109f2fc13bda4d5c7e839 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 9 Jan 2020 14:26:42 -0500
Subject: [PATCH 3/3] less implementation specific

---
 newsfragments/2941.bugfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newsfragments/2941.bugfix b/newsfragments/2941.bugfix
index 049807705..201e7d3ac 100644
--- a/newsfragments/2941.bugfix
+++ b/newsfragments/2941.bugfix
@@ -1 +1 @@
-"tox -e codechecks" puts back the local file it mv's while doing code-checks
\ No newline at end of file
+"tox -e codechecks" no longer dirties the working tree.