Remove sphinx template dir
parent
e697104f03
commit
95323e0518
|
@ -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_TEMPLATE_DIR
|
from ..constants import PDF_RE
|
||||||
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
|
||||||
|
@ -63,7 +63,6 @@ class BaseSphinx(BaseBuilder):
|
||||||
'sphinx/conf.py.conf', {
|
'sphinx/conf.py.conf', {
|
||||||
'project': self.project,
|
'project': self.project,
|
||||||
'version': self.version,
|
'version': self.version,
|
||||||
'template_dir': SPHINX_TEMPLATE_DIR,
|
|
||||||
'master_doc': master_doc,
|
'master_doc': master_doc,
|
||||||
})
|
})
|
||||||
conf_file = os.path.join(docs_dir, 'conf.py')
|
conf_file = os.path.join(docs_dir, 'conf.py')
|
||||||
|
@ -114,7 +113,6 @@ class BaseSphinx(BaseBuilder):
|
||||||
'project': self.project,
|
'project': self.project,
|
||||||
'version': self.version,
|
'version': self.version,
|
||||||
'settings': settings,
|
'settings': settings,
|
||||||
'template_path': SPHINX_TEMPLATE_DIR,
|
|
||||||
'conf_py_path': conf_py_path,
|
'conf_py_path': conf_py_path,
|
||||||
'api_host': getattr(
|
'api_host': getattr(
|
||||||
settings,
|
settings,
|
||||||
|
|
|
@ -12,12 +12,6 @@ from django.conf import settings
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
SPHINX_TEMPLATE_DIR = os.path.join(
|
|
||||||
settings.SITE_ROOT,
|
|
||||||
'readthedocs',
|
|
||||||
'templates',
|
|
||||||
'sphinx',
|
|
||||||
)
|
|
||||||
MKDOCS_TEMPLATE_DIR = os.path.join(
|
MKDOCS_TEMPLATE_DIR = os.path.join(
|
||||||
settings.SITE_ROOT,
|
settings.SITE_ROOT,
|
||||||
'readthedocs',
|
'readthedocs',
|
||||||
|
|
|
@ -43,7 +43,6 @@ from .constants import (
|
||||||
DOCKER_TIMEOUT_EXIT_CODE,
|
DOCKER_TIMEOUT_EXIT_CODE,
|
||||||
DOCKER_VERSION,
|
DOCKER_VERSION,
|
||||||
MKDOCS_TEMPLATE_DIR,
|
MKDOCS_TEMPLATE_DIR,
|
||||||
SPHINX_TEMPLATE_DIR,
|
|
||||||
)
|
)
|
||||||
from .exceptions import (
|
from .exceptions import (
|
||||||
BuildEnvironmentCreationFailed,
|
BuildEnvironmentCreationFailed,
|
||||||
|
@ -866,10 +865,6 @@ class DockerBuildEnvironment(BuildEnvironment):
|
||||||
``client.create_container``.
|
``client.create_container``.
|
||||||
"""
|
"""
|
||||||
binds = {
|
binds = {
|
||||||
SPHINX_TEMPLATE_DIR: {
|
|
||||||
'bind': SPHINX_TEMPLATE_DIR,
|
|
||||||
'mode': 'ro',
|
|
||||||
},
|
|
||||||
MKDOCS_TEMPLATE_DIR: {
|
MKDOCS_TEMPLATE_DIR: {
|
||||||
'bind': MKDOCS_TEMPLATE_DIR,
|
'bind': MKDOCS_TEMPLATE_DIR,
|
||||||
'mode': 'ro',
|
'mode': 'ro',
|
||||||
|
|
|
@ -7,7 +7,7 @@ from datetime import datetime
|
||||||
from recommonmark.parser import CommonMarkParser
|
from recommonmark.parser import CommonMarkParser
|
||||||
|
|
||||||
extensions = []
|
extensions = []
|
||||||
templates_path = ['{{ template_dir }}', 'templates', '_templates', '.templates']
|
templates_path = ['templates', '_templates', '.templates']
|
||||||
source_suffix = ['.rst', '.md']
|
source_suffix = ['.rst', '.md']
|
||||||
source_parsers = {
|
source_parsers = {
|
||||||
'.md': CommonMarkParser,
|
'.md': CommonMarkParser,
|
||||||
|
|
Loading…
Reference in New Issue