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.

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

Jump to bottom

Fix Sphinx conf.py inserts #5150

Merged
merged 3 commits into from
Jan 22, 2019
Merged

Fix Sphinx conf.py inserts #5150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76bdfc8
Revert "Make our generated conf.py compatible with Py2 and Py3"
ericholscher Jan 22, 2019
489192c
Fix test conf
ericholscher Jan 22, 2019
d571d24
Fix tests properly
ericholscher Jan 22, 2019
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
7 changes: 3 additions & 4 deletions readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# https://github.com/rtfd/readthedocs.org/blob/master/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
#

from __future__ import absolute_import, division, print_function, unicode_literals

import importlib
import sys
Expand Down Expand Up @@ -82,9 +81,9 @@ context = {
("{{ slug }}", "{{ url }}"),{% endfor %}
],
'slug': '{{ project.slug }}',
'name': '{{ project.name }}',
'rtd_language': '{{ project.language }}',
'programming_language': '{{ project.programming_language }}',
'name': u'{{ project.name }}',
'rtd_language': u'{{ project.language }}',
'programming_language': u'{{ project.programming_language }}',
'canonical_url': '{{ project.get_canonical_url }}',
'analytics_code': '{{ project.analytics_code }}',
'single_version': {{ project.single_version }},
Expand Down
6 changes: 3 additions & 3 deletions readthedocs/rtd_tests/files/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'.md': CommonMarkParser,
}
master_doc = 'index'
project = 'Pip'
project = u'Pip'
copyright = str(datetime.now().year)
version = '0.8.1'
release = '0.8.1'
Expand All @@ -23,6 +23,6 @@
html_theme = 'sphinx_rtd_theme'
file_insertion_enabled = False
latex_documents = [
('index', 'pip.tex', 'Pip Documentation',
'', 'manual'),
('index', 'pip.tex', u'Pip Documentation',
u'', 'manual'),
]
6 changes: 3 additions & 3 deletions readthedocs/templates/sphinx/conf.py.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ source_parsers = {
'.md': CommonMarkParser,
}
master_doc = 'index'
project = '{{ project.name }}'
project = u'{{ project.name }}'
copyright = str(datetime.now().year)
version = '{{ version.verbose_name }}'
release = '{{ version.verbose_name }}'
Expand All @@ -23,6 +23,6 @@ htmlhelp_basename = '{{ project.slug }}'
html_theme = 'sphinx_rtd_theme'
file_insertion_enabled = False
latex_documents = [
('index', '{{ project.slug }}.tex', '{{ project.name }} Documentation',
'{{ project.copyright }}', 'manual'),
('index', '{{ project.slug }}.tex', u'{{ project.name }} Documentation',
u'{{ project.copyright }}', 'manual'),
]