From 276cbb6f0d79004c2f56c43b78086f793f818658 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 1 Mar 2017 11:59:04 -0800
Subject: [PATCH 1/4] Upgrade Sphinx version and theme.

I did some basic builds locally that looked and worked fine,
and we have a lot of users using 1.5 in requirements files.
We don't have a great way to stress test this,
but I think we should definitely push it out as a default.
---
 readthedocs/doc_builder/python_environments.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py
index 9d4795b3525..80a519df5b3 100644
--- a/readthedocs/doc_builder/python_environments.py
+++ b/readthedocs/doc_builder/python_environments.py
@@ -102,7 +102,7 @@ def setup_base(self):
 
     def install_core_requirements(self):
         requirements = [
-            'sphinx==1.3.5',
+            'sphinx==1.5.2',
             'Pygments==2.1.3',
             'setuptools==20.1.1',
             'docutils==0.12',
@@ -111,7 +111,7 @@ def install_core_requirements(self):
             'pillow==2.6.1',
             ('git+https://github.com/rtfd/readthedocs-sphinx-ext.git'
              '@0.6-alpha#egg=readthedocs-sphinx-ext'),
-            'sphinx-rtd-theme==0.1.9',
+            'sphinx-rtd-theme==0.2.0',
             'alabaster>=0.7,<0.8,!=0.7.5',
             'commonmark==0.5.4',
             'recommonmark==0.1.1',

From ad0072466e5c04b3e0f25e180474902188090ed2 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 1 Mar 2017 12:04:18 -0800
Subject: [PATCH 2/4] Upgrade req in our requirements, too

---
 requirements/pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/pip.txt b/requirements/pip.txt
index b11bd910835..c26e71ed933 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -2,7 +2,7 @@
 pip==8.1.1
 virtualenv==15.0.1
 docutils==0.11
-Sphinx==1.3.5
+Sphinx==1.5.3
 Pygments==2.0.2
 mkdocs==0.14.0
 readthedocs-build==2.0.6

From e179c2a8798a5bd73adfc1d66d1ad3756818fdec Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 1 Mar 2017 12:13:25 -0800
Subject: [PATCH 3/4] Add theme requirement

---
 requirements/pip.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements/pip.txt b/requirements/pip.txt
index c26e71ed933..28ac365b7f2 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -3,6 +3,7 @@ pip==8.1.1
 virtualenv==15.0.1
 docutils==0.11
 Sphinx==1.5.3
+sphinx_rtd_theme==0.2.0
 Pygments==2.0.2
 mkdocs==0.14.0
 readthedocs-build==2.0.6

From 17b60680b5901186b5149762c496d0062161e314 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 1 Mar 2017 12:56:29 -0800
Subject: [PATCH 4/4] 1.5.3 for Sphinx

---
 readthedocs/doc_builder/python_environments.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py
index 80a519df5b3..eba666805a4 100644
--- a/readthedocs/doc_builder/python_environments.py
+++ b/readthedocs/doc_builder/python_environments.py
@@ -102,7 +102,7 @@ def setup_base(self):
 
     def install_core_requirements(self):
         requirements = [
-            'sphinx==1.5.2',
+            'sphinx==1.5.3',
             'Pygments==2.1.3',
             'setuptools==20.1.1',
             'docutils==0.12',