STORY-18531: Update older version to match current theme

Author: walterbloom11

.readthedocs.yaml

@@ -19,4 +19,4 @@ sphinx:
 # https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
 python:
   install:
-  - requirements: requirements.txt
+    - requirements: requirements.txt

requirements.pip requirements.txtrequirements.pip renamed to requirements.txt

@@ -2,3 +2,5 @@ sphinx
 sphinx-rtd-theme
 sphinxcontrib-httpdomain
 -e git+https://github.com/rtfd/recommonmark.git#egg=recommonmark
+PyYAML
+ipdb

source/conf.py

@@ -100,7 +100,7 @@ def build_template(match, template_file_name):
 
   # open the template and find/replace the keys with the values
   template = open('{}{}'.format(custom_template_path, template_file_name), 'r').read()
-  for search, replacement in template_vars.iteritems():
+  for search, replacement in template_vars.items():
     if re.search(search, template):
       template = template.replace(search, replacement)
     else:
@@ -133,7 +133,7 @@ def source_handler(app, docname, source):
   source[0] = build_api_endpoint_template(source[0])
 
   # Replace @@API_VERSION in templates with strings from doc_versions.py
-  for symbol_string, version_string in VERSIONS.iteritems():
+  for symbol_string, version_string in VERSIONS.items():
     source[0] = re.sub(symbol_string, version_string, source[0])
 
 # Replace all occurences of @@ variables in partials (.rst files beginning w/ an underscore)
@@ -143,7 +143,7 @@ def build_partials(app, env, docnames):
     if re.search(r"/_[^/]+$", docname) and not re.search('custom_template', docname):
       # Replace @@API_VERSION with strings in doc_versions.py
       partial = open('{}{}{}'.format(source_path, docname, '.rst'), 'r').read()
-      for symbol_string, version_string in VERSIONS.iteritems():
+      for symbol_string, version_string in VERSIONS.items():
         partial = re.sub(symbol_string, version_string, partial)
         new_docname = docname + '.tmp'
         tmp_files.append('{}{}'.format(source_path, new_docname))
@@ -200,13 +200,14 @@ def setup(app):
   app.connect('env-before-read-docs', build_partials)
   app.connect('source-read', source_handler)
   app.connect('html-page-context', update_body)
-  app.add_javascript('js/custom.js')
-  app.add_javascript('https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js')
+  app.add_js_file('js/custom.js')
+  app.add_js_file('https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js')
+  app.add_js_file('https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js')
 
   # This CSS is added BEFORE the RTD CSS, so it doesn't allow us to override their CSS
   # We re-add our CSS AFTER the RTD CSS using the update_body method. We have left this
   # in place here so the CSS will load when you build and view locally instead of on RTD
-  app.add_stylesheet('css/custom.css')
+  app.add_css_file('css/custom.css')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -252,13 +253,10 @@ def setup(app):
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
-# When building locally, the theme is not automatically imported
-# When we're not on read the docs, we have to import it and set the theme manually.
-if not on_rtd:
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
+# The theme is not automatically imported by RTD, so we have to import manually
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 html_context = {}
 
 # Theme options are theme-specific and customize the look and feel of a theme