From e697104f03e3380b2827d82859c260241857e4fc Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Wed, 26 Dec 2018 13:05:02 -0500
Subject: [PATCH] Remove sphinx static dir

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

We don't override the template from rtd (#1946)
---
 readthedocs/doc_builder/backends/sphinx.py                 | 3 +--
 readthedocs/doc_builder/constants.py                       | 1 -
 readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/readthedocs/doc_builder/backends/sphinx.py b/readthedocs/doc_builder/backends/sphinx.py
index 3cfe5766d..e8070fcd6 100644
--- a/readthedocs/doc_builder/backends/sphinx.py
+++ b/readthedocs/doc_builder/backends/sphinx.py
@@ -27,7 +27,7 @@ from readthedocs.restapi.client import api
 from readthedocs.projects.models import Feature
 
 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 ..exceptions import BuildEnvironmentError
 from ..signals import finalize_sphinx_context_data
@@ -114,7 +114,6 @@ class BaseSphinx(BaseBuilder):
             'project': self.project,
             'version': self.version,
             'settings': settings,
-            'static_path': SPHINX_STATIC_DIR,
             'template_path': SPHINX_TEMPLATE_DIR,
             'conf_py_path': conf_py_path,
             'api_host': getattr(
diff --git a/readthedocs/doc_builder/constants.py b/readthedocs/doc_builder/constants.py
index 14598ea00..518a2c9f9 100644
--- a/readthedocs/doc_builder/constants.py
+++ b/readthedocs/doc_builder/constants.py
@@ -24,7 +24,6 @@ MKDOCS_TEMPLATE_DIR = os.path.join(
     'templates',
     'mkdocs',
 )
-SPHINX_STATIC_DIR = os.path.join(SPHINX_TEMPLATE_DIR, '_static')
 
 PDF_RE = re.compile('Output written on (.*?)')
 
diff --git a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
index a5f0d064c..e36cdd16a 100644
--- a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
+++ b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
@@ -37,7 +37,6 @@ if not 'html_static_path' in globals():
     html_static_path = []
 if os.path.exists('_static'):
     html_static_path.append('_static')
-html_static_path.append('{{ static_path }}')
 
 # Add RTD Theme only if they aren't overriding it already
 using_rtd_theme = (