Changeset d187e37 in trunk

Timestamp:

2020-01-13T15:49:02Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

4ae6cc9, e5abd35, f5f27b8

Parents:

e1acacd (diff), d4f909f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jean-Paul Calderone <exarkun@…> (2020-01-13 15:49:02)

git-committer:

GitHub <noreply@…> (2020-01-13 15:49:02)

Message:

Merge pull request #674 from tahoe-lafs/2941.codechecks-clean

Make "tox -e codechecks" clean

Fixes: ticket:2941

Files:

• newsfragments/2941.bugfix (added)
• tox.ini (modified) (3 diffs)

tox.ini ¶

@@ -82 +82 @@
          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
+         python -m towncrier.check --pyproject towncrier.pyproject.toml
 
 [testenv:draftnews]
@@ -116 +105 @@
          # 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
 
@@ -123 +115 @@
          # put it back
          mv pyproject.toml towncrier.pyproject.toml
-
 
 [testenv:deprecations]