Skip to content

Upgrade Sphinx version and theme. #2676

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 2, 2017
Merged

Upgrade Sphinx version and theme. #2676

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
276cbb6
Upgrade Sphinx version and theme.
ericholscher Mar 1, 2017
ad00724
Upgrade req in our requirements, too
ericholscher Mar 1, 2017
e179c2a
Add theme requirement
ericholscher Mar 1, 2017
17b6068
1.5.3 for Sphinx
ericholscher Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions readthedocs/doc_builder/python_environments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def setup_base(self):

def install_core_requirements(self):
requirements = [
'sphinx==1.3.5',
'sphinx==1.5.2',
Copy link
Member

Choose a reason for hiding this comment

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

why not 1.5.3?

Copy link
Member Author

@ericholscher ericholscher Mar 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Ha, didn't see it was released -- also this was an old commit :)

'Pygments==2.1.3',
'setuptools==20.1.1',
'docutils==0.12',
Expand All @@ -111,7 +111,7 @@ def install_core_requirements(self):
'pillow==2.6.1',
('git+https://github.com/rtfd/readthedocs-sphinx-ext.git'
'@0.6-alpha#egg=readthedocs-sphinx-ext'),
'sphinx-rtd-theme==0.1.9',
'sphinx-rtd-theme==0.2.0',
'alabaster>=0.7,<0.8,!=0.7.5',
'commonmark==0.5.4',
'recommonmark==0.1.1',
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pip==8.1.1
virtualenv==15.0.1
docutils==0.11
Sphinx==1.3.5
Sphinx==1.5.3
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure if we still even need these as requirements for the code, since all the Sphinx interaction happens inside Docker. I guess for non-docker installs it's still required, so might as well update it.

Pygments==2.0.2
mkdocs==0.14.0
readthedocs-build==2.0.6
Expand Down