EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove sphinx static dir 

This is already handled by the rtd-sphinx-extension.

We don't override the template from rtd (#1946)
ghowardsit
Santos Gallegos 2018-12-26 13:05:02 -05:00
parent 5386e844ac
commit e697104f03
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
readthedocs/doc_builder/backends/sphinx.py
View File

@ -27,7 +27,7 @@ from readthedocs.restapi.client import api
from readthedocs.projects.models import Feature from readthedocs.projects.models import Feature
from ..base import BaseBuilder, restoring_chdir from ..base import BaseBuilder, restoring_chdir
from ..constants import PDF_RE, SPHINX_STATIC_DIR, SPHINX_TEMPLATE_DIR from ..constants import PDF_RE, SPHINX_TEMPLATE_DIR
from ..environments import BuildCommand, DockerBuildCommand from ..environments import BuildCommand, DockerBuildCommand
from ..exceptions import BuildEnvironmentError from ..exceptions import BuildEnvironmentError
from ..signals import finalize_sphinx_context_data from ..signals import finalize_sphinx_context_data
@ -114,7 +114,6 @@ class BaseSphinx(BaseBuilder):
'project': self.project, 'project': self.project,
'version': self.version, 'version': self.version,
'settings': settings, 'settings': settings,
'static_path': SPHINX_STATIC_DIR,
'template_path': SPHINX_TEMPLATE_DIR, 'template_path': SPHINX_TEMPLATE_DIR,
'conf_py_path': conf_py_path, 'conf_py_path': conf_py_path,
'api_host': getattr( 'api_host': getattr(

1
readthedocs/doc_builder/constants.py
View File

@ -24,7 +24,6 @@ MKDOCS_TEMPLATE_DIR = os.path.join(
'templates', 'templates',
'mkdocs', 'mkdocs',
) )
SPHINX_STATIC_DIR = os.path.join(SPHINX_TEMPLATE_DIR, '_static')
PDF_RE = re.compile('Output written on (.*?)') PDF_RE = re.compile('Output written on (.*?)')

1
readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
View File

@ -37,7 +37,6 @@ if not 'html_static_path' in globals():
html_static_path = [] html_static_path = []
if os.path.exists('_static'): if os.path.exists('_static'):
html_static_path.append('_static') html_static_path.append('_static')
html_static_path.append('{{ static_path }}')
# Add RTD Theme only if they aren't overriding it already # Add RTD Theme only if they aren't overriding it already
using_rtd_theme = ( using_rtd_theme = (