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

Docs/move to sphinx-multiversion #104

Merged
merged 7 commits into from
Oct 26, 2020

Conversation

orviz
Copy link
Member

@orviz orviz commented Oct 5, 2020

Main reason to move away from sphinx-versioning is that the workaround for the import error issue found in sphinx >1.7 does not work for us.

@orviz orviz added documentation enhancement New feature or request labels Oct 5, 2020
Copy link
Collaborator

@samuelbernardolip samuelbernardolip left a comment

Choose a reason for hiding this comment

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

@orviz if my comments are not an issue in current implementation, I approve the current PR.

<title>Redirecting to master branch</title>
<meta charset="utf-8">
<meta http-equiv="refresh" content="0; url=./2.0.0/index.html">
<link rel="canonical" href="https://localhost:8081/2.0.0/index.html">
Copy link
Collaborator

Choose a reason for hiding this comment

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

@orviz Shoudn't the url here be with the real domain name for the documentation instead of localhost?

Copy link
Member Author

Choose a reason for hiding this comment

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

you're absolutely right

Copy link
Member Author

Choose a reason for hiding this comment

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

indeed we don't need this file anymore since we are not longer using html_additional_pages in conf.py

@@ -344,3 +345,6 @@

# -- Options for sphinx-versioning -------------------------------------------
scv_whitelist_branches = ('(stable|release){1}/.+',)
# -- Options for sphinx-multiversion------------------------------------------
smv_branch_whitelist = r'(stable|release){1}/.+'
Copy link
Collaborator

Choose a reason for hiding this comment

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

@orviz is expected that master branch be excluded from the documentation releases? And what about tags x.y.z?

Copy link
Member Author

Choose a reason for hiding this comment

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

when testing the sphinx-multiversion the documentation for the tag 2.0.0 was automatically built, that's why I didn't include a specific definition for the tags. But, as you propose, it does no harm to provide a whitelist for tags too. I've tested it and works as expected.

@orviz orviz merged commit e6bcf06 into jenkins/release/2.1.0 Oct 26, 2020
@orviz orviz deleted the docs/move_to_sphinx_multiversion branch October 26, 2020 07:35
orviz added a commit that referenced this pull request Oct 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants