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

Use sphinx built-in Napoleon with the upstream patch #428

Merged
merged 1 commit into from
Feb 17, 2021

Conversation

SolidifiedRay
Copy link
Contributor

@SolidifiedRay SolidifiedRay commented Feb 15, 2021

Fixes issue #401:

Description of the changes being introduced by the pull request:

  • Replace the napoleon fork with sphinx built-in Napoleon
  • Update the sphinx setup to use the upstream patch

I submitted a patch to the Sphinx community to support our custom Side Effect docstring section. This patch was merged and released in Sphinx v3.5.0, so we can now replace the temporary napoleon fork (PR #420) with the sphinx built in Napoleon extension.

See: sphinx-doc/sphinx#8658

Please verify and check that the pull request fulfills the following
requirements
:

  • The code follows the Code Style Guidelines
  • Tests have been added for the bug fix or new feature
  • Docs have been added for the bug fix or new feature

Copy link
Member

@lukpueh lukpueh left a comment

Choose a reason for hiding this comment

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

Cool stuff, @SolidifiedRay! I have 2 minor nitpicks. Please fix an we can merge.

doc/source/conf.py Outdated Show resolved Hide resolved
doc/source/conf.py Outdated Show resolved Hide resolved
Signed-off-by: SolidifiedRay <yc3346@nyu.edu>
@SolidifiedRay
Copy link
Contributor Author

I have updated the fix. Thanks for the review! @lukpueh

@adityasaky
Copy link
Member

Great work, @SolidifiedRay, good stuff with the upstream merge!

@lukpueh lukpueh merged commit 3232f52 into in-toto:develop Feb 17, 2021
@lukpueh lukpueh mentioned this pull request Mar 1, 2021
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.

None yet

3 participants