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

fix #1041 update spinx-rtd scheme #1120

Merged
merged 1 commit into from
Feb 15, 2018

Conversation

ltalirz
Copy link
Member

@ltalirz ltalirz commented Feb 15, 2018

This fixes an issue with line numbers not being displayed correctly.
(worked in docs created locally, but still broken on the web: Example: Search for "Here is the code:" on http://aiida-core.readthedocs.io/en/latest/work/index.html )

  • update sphinx rtd theme also for read-the-docs documentation
  • update python script for updating reqs

This fixes an issue with line numbers not being displayed correctly.

 * update sphinx rtd theme also for read-the-docs documentation
 * update python script for updating reqs
@sphuber
Copy link
Contributor

sphuber commented Feb 15, 2018

Thanks Leopold for looking at this. Since the previous PR that addressed this issue was merged into release_v0.11.0 could you please rebase your branch on release_v0.11.1. That way it will be fixed in the next patch release

Copy link
Contributor

@sphuber sphuber left a comment

Choose a reason for hiding this comment

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

Please rebase on release_v0.11.1 branch

@ltalirz
Copy link
Member Author

ltalirz commented Feb 15, 2018

@sphuber The reason this was branched off develop is that the documentation on RTD is built from develop. http://aiida-core.readthedocs.io/en/latest/
That's correct isn't it?

@sphuber
Copy link
Contributor

sphuber commented Feb 15, 2018

Yes I guess that's true, but the release branch will be merged into develop once it is released. I am not sure if it is nice to also have it fixed in the release branch already. If not then I guess we can just merge into develop straight away

@ltalirz
Copy link
Member Author

ltalirz commented Feb 15, 2018

Well, the only point where this shows up is on RTD and I would rather have the 'latest' docs (which everyone reads) fixed now than the 0.11.1 + latest docs fixed whenever 0.11.1 is released.

@sphuber sphuber merged commit db7c5c1 into aiidateam:develop Feb 15, 2018
@ltalirz ltalirz deleted the fix_issue_1041_rtd_line_numbers branch June 26, 2018 11:45
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.

2 participants