Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maintenance for sphinx 4.x #464

Merged
merged 3 commits into from
May 2, 2021
Merged

maintenance for sphinx 4.x #464

merged 3 commits into from
May 2, 2021

Conversation

jdknight
Copy link
Member

@jdknight jdknight commented May 2, 2021

storage: support emphasis of identifier values in signatures

For releases of Sphinx pre-v4.x, signature descriptors could contain identifier entries wrapped in an emphasis node. In the most recent version of Sphinx (observed in 4.0.0b2), identifiers may not be wrapped in an emphasis node. Instead of relying on an emphasis node, use the class hint which identifiers an identifiers type [1] to build an em container.

storage: handle no-alignment as default alignment

Sphinx has been refactoring [2][3] its implementation to adjust the use of the default alignment back to None, to follow with docutils. Adjusting a series of lines which rely on the default assignment as a hint for default alignment, where now an unset alignment applies the default alignment as well.


[1]: https://github.com/sphinx-doc/sphinx/blob/v3.5.4/sphinx/addnodes.py#L224-L226
[2]: sphinx-doc/sphinx#4550 (comment)
[3]: sphinx-doc/sphinx#8690

jdknight added 3 commits May 2, 2021 15:50
Adding a `prerelease` test environment for tox to allow a developer to
fetch all pre-release versions of dependencies for a test run. This is
primarily to help test against pre-release versions of Sphinx to help
handle changes introduced in a new major release.

Signed-off-by: James Knight <james.d.knight@live.com>
For releases of Sphinx pre-v4.x, signature descriptors could contain
identifier entries wrapped in an emphasis node. In the most recent
version of Sphinx (observed in 4.0.0b2), identifiers may not be wrapped
in an emphasis node. Instead of relying on an emphasis node, use the
class hint which identifiers an identifiers type [1] to build an `em`
container.

[1]: https://github.com/sphinx-doc/sphinx/blob/v3.5.4/sphinx/addnodes.py#L224-L226

Signed-off-by: James Knight <james.d.knight@live.com>
Sphinx has been refactoring [1][2] its implementation to adjust the use
of the `default` alignment back to `None`, to follow with docutils.
Adjusting a series of lines which rely on the `default` assignment as a
hint for default alignment, where now an unset alignment applies the
default alignment as well.

[1]: sphinx-doc/sphinx#4550 (comment)
[2]: sphinx-doc/sphinx#8690

Signed-off-by: James Knight <james.d.knight@live.com>
@jdknight jdknight merged commit f66902a into master May 2, 2021
@jdknight jdknight deleted the maintenance-for-sphinx-4.x branch May 2, 2021 20:56
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.

1 participant