Skip to content

docs: move changelog to docs/en and allow sphinx directives#6287

Merged
nicoddemus merged 1 commit intopytest-dev:masterfrom
nicoddemus:sphinx-changelog
Nov 29, 2019
Merged

docs: move changelog to docs/en and allow sphinx directives#6287
nicoddemus merged 1 commit intopytest-dev:masterfrom
nicoddemus:sphinx-changelog

Conversation

@nicoddemus
Copy link
Member

Now tox -e docs will also include the draft changelog for the
next version (locally only).

CHANGELOG.rst now only points to the changelog on READTHEDOCS so
sphinx diretives can be used.

Followup to #6272

Copy link
Contributor

@blueyed blueyed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now tox -e docs will also include the draft changelog for the
next version (locally only).

Isn't it included always now? (since the Sphinx tag is used always - but maybe the idea is that RTD does not use the tag?)
I've used docs-draft to have an explicit distinction there, i.e. docs would be what you get for an release (without towncrier being run).
I'm not opposed to have it simplified into a single env though really, just wanted to confirm.

Now `tox -e docs` will also include the draft changelog for the
next version (locally only).

`CHANGELOG.rst` now only points to the changelog on READTHEDOCS so
sphinx diretives can be used.

Followup to pytest-dev#6272
@nicoddemus
Copy link
Member Author

Isn't it included always now? (since the Sphinx tag is used always - but maybe the idea is that RTD does not use the tag?)

Exactly! I've added comments to make that more clear. 👍

@nicoddemus nicoddemus merged commit 277857b into pytest-dev:master Nov 29, 2019
@nicoddemus nicoddemus deleted the sphinx-changelog branch November 29, 2019 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants