Merge pull request #1597 from rtfd/dont-support-readme-copy

Delete logic that copies README.

Author: agjohnson

readthedocs/doc_builder/backends/sphinx.py

@@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs):
             docs_dir = self.docs_dir()
             self.old_artifact_path = os.path.join(docs_dir, self.sphinx_build_dir)
 
-    def _write_config(self):
+    def _write_config(self, master_doc='index'):
         """
         Create ``conf.py`` if it doesn't exist.
         """
@@ -52,6 +52,7 @@ def _write_config(self):
                                          {'project': self.project,
                                           'version': self.version,
                                           'template_dir': TEMPLATE_DIR,
+                                          'master_doc': master_doc,
                                           })
         conf_file = os.path.join(docs_dir, 'conf.py')
         safe_write(conf_file, conf_template)
@@ -64,8 +65,8 @@ def append_conf(self, **kwargs):
         try:
             conf_py_path = self.version.get_conf_py_path()
         except ProjectImportError:
-            self._write_config()
-            self.create_index(extension='rst')
+            master_doc = self.create_index(extension='rst')
+            self._write_config(master_doc=master_doc)
 
         project = self.project
         # Open file for appending.

readthedocs/doc_builder/base.py

@@ -98,8 +98,7 @@ def create_index(self, extension='md', **kwargs):
         if not os.path.exists(index_filename):
             readme_filename = os.path.join(docs_dir, 'README.{ext}'.format(ext=extension))
             if os.path.exists(readme_filename):
-                os.system('mv {readme} {index}'.format(index=index_filename,
-                                                       readme=readme_filename))
+                return 'README'
             else:
                 index_file = open(index_filename, 'w+')
                 index_text = """
@@ -116,6 +115,7 @@ def create_index(self, extension='md', **kwargs):
 
                 index_file.write(index_text.format(dir=docs_dir, ext=extension))
                 index_file.close()
+        return 'index'
 
     def run(self, *args, **kwargs):
         '''Proxy run to build environment'''

readthedocs/templates/sphinx/conf.py.conf

@@ -1,17 +1,19 @@
 # -*- coding: utf-8 -*-
 
+# This is the conf.py file that we create automatically for projects.
+# It will still get the RTD logic appended to it.
+
 import sys, os
 extensions = []
-templates_path = ['{{ template_dir }}', 'templates', '_templates', '.templates']
+templates_path = ['{{ template_dir }}']
 source_suffix = '{{ project.suffix }}'
-master_doc = 'index'
+master_doc = '{{ master_doc }}'
 project = u'{{ project.name }}'
 copyright = u'{{ project.copyright }}'
 version = '{{ version.verbose_name }}'
 release = '{{ version.verbose_name }}'
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
-htmlhelp_basename = '{{ project.slug }}'
 file_insertion_enabled = False
 latex_documents = [
   ('index', '{{ project.slug }}.tex', u'{{ project.name }} Documentation',