Merge pull request tahoe-lafs#1076 from tahoe-lafs/3730.update-towncrier

Update towncrier Fixes ticket:3730
sajith · Jun 7, 2021 · 074a5f7 · 074a5f7
2 parents e2831ee + 9678d2f
commit 074a5f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 47 deletions.
diff --git a/newsfragments/3730.minor b/newsfragments/3730.minor
diff --git a/towncrier.pyproject.toml → towncrier.toml b/towncrier.pyproject.toml → towncrier.toml
diff --git a/tox.ini b/tox.ini
@@ -136,8 +136,8 @@ commands =
          # 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 towncrier.pyproject.toml for legal <change type> values.
-         python -m towncrier.check --config towncrier.pyproject.toml
+         # file.  See towncrier.toml for legal <change type> values.
+         python -m towncrier.check --config towncrier.toml
 
 
 [testenv:codechecks3]
@@ -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 =