diff --git a/towncrier.pyproject.toml b/towncrier.pyproject.toml index 266f81a3a..4f6afa710 100644 --- a/towncrier.pyproject.toml +++ b/towncrier.pyproject.toml @@ -1,8 +1,6 @@ [tool.towncrier] -# towncrier requires python3.5+ but Tahoe-LAFS doesn't support that -# so we can't import it -- must specify --version to towncrier -# package = "allmydata" -# package_dir = "src" + package_dir = "src" + package = "allmydata" filename = "NEWS.rst" directory = "newsfragments" start_string = ".. towncrier start line" diff --git a/tox.ini b/tox.ini index e1f39ed67..f5b83e390 100644 --- a/tox.ini +++ b/tox.ini @@ -68,7 +68,6 @@ commands = python -m towncrier.check [testenv:draftnews] -basepython=python3.6 passenv = TAHOE_LAFS_* PIP_* SUBUNITREPORTER_* USERPROFILE HOMEDRIVE HOMEPATH # Get "certifi" to avoid bug #2913. Basically if a `setup_requires=...` causes # a package to be installed (with setuptools) then it'll fail on certain @@ -79,8 +78,7 @@ passenv = TAHOE_LAFS_* PIP_* SUBUNITREPORTER_* USERPROFILE HOMEDRIVE HOMEPATH whitelist_externals = mv deps = certifi - towncrier -skip_install = true + towncrier >= 19.2 commands = # With pip >= 10 the existence of pyproject.toml (which we are # required to have to configure towncrier) triggers a "build @@ -93,9 +91,8 @@ commands = # https://github.com/pypa/pip/issues/5696 mv towncrier.pyproject.toml pyproject.toml - # this burns in another copy of the version -- but we can't - # import tahoe until it supports python3.5+ - python -m towncrier --draft --version 1.14.0 + # towncrier 19.2 + works with python2.7 + python -m towncrier --draft # put it back mv pyproject.toml towncrier.pyproject.toml