From 18c6a6ae98cbd586e2993021cde697c1ef8d5c63 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 11 Feb 2016 13:33:55 +0900
Subject: [PATCH 1/6] Fix equations are not centering in haiku theme (ref:
 #2294)

---
 sphinx/themes/haiku/static/haiku.css_t | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sphinx/themes/haiku/static/haiku.css_t b/sphinx/themes/haiku/static/haiku.css_t
index 0c20fd5c1..4fc150106 100644
--- a/sphinx/themes/haiku/static/haiku.css_t
+++ b/sphinx/themes/haiku/static/haiku.css_t
@@ -369,3 +369,8 @@ div.viewcode-block:target {
     margin: -1px -10px;
     padding: 0 12px;
 }
+
+/* math display */
+div.math p {
+    text-align: center;
+}

From a9b17ba3518c8cb2d178c5574cdae4c7bfe8f860 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 11 Feb 2016 13:38:07 +0900
Subject: [PATCH 2/6] Fix equations are not centering in agogo theme (ref:
 #2294)

---
 sphinx/themes/agogo/static/agogo.css_t | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index 26df9d6d5..f3c8d67d5 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -507,3 +507,13 @@ div.code-block-caption {
     padding: 2px 5px;
     font-size: small;
 }
+
+/* -- math display ---------------------------------------------------------- */
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}

From 69ae993e9651eacd01d08398518df389e74e734d Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 11 Feb 2016 13:39:48 +0900
Subject: [PATCH 3/6] Fix equations are not centering in scrolls theme (ref:
 #2294)

---
 sphinx/themes/scrolls/static/scrolls.css_t | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sphinx/themes/scrolls/static/scrolls.css_t b/sphinx/themes/scrolls/static/scrolls.css_t
index 83752c9d1..12bb7755e 100644
--- a/sphinx/themes/scrolls/static/scrolls.css_t
+++ b/sphinx/themes/scrolls/static/scrolls.css_t
@@ -471,3 +471,13 @@ div.figure p.caption span.caption-number {
 
 div.figure p.caption span.caption-text {
 }
+
+/* math display */
+
+div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}

From dfe6b1fea34870c8d594cdf24fa9633d9cdc889f Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 11 Feb 2016 13:41:49 +0900
Subject: [PATCH 4/6] Fix equations are not centering in traditional theme
 (ref: #2294)

---
 sphinx/themes/traditional/static/traditional.css_t | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sphinx/themes/traditional/static/traditional.css_t b/sphinx/themes/traditional/static/traditional.css_t
index b98de2268..1e1127eda 100644
--- a/sphinx/themes/traditional/static/traditional.css_t
+++ b/sphinx/themes/traditional/static/traditional.css_t
@@ -736,3 +736,13 @@ div.figure p.caption span.caption-number {
 
 div.figure p.caption span.caption-text {
 }
+
+/* :::: MATH DISPLAY :::: */
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}

From c012b933858df3f07ab691533e8c846d8f56d426 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 11 Feb 2016 15:21:18 +0900
Subject: [PATCH 5/6] Fix UnicodeDecodeError if autodoc crashed on importing
 codes including multibyte characters in py2

---
 sphinx/ext/autodoc.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 8c7524aaa..8cd8845b0 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -17,7 +17,7 @@ import inspect
 import traceback
 from types import FunctionType, BuiltinFunctionType, MethodType
 
-from six import iterkeys, iteritems, itervalues, text_type, class_types, \
+from six import PY2, iterkeys, iteritems, itervalues, text_type, class_types, \
     string_types
 from docutils import nodes
 from docutils.utils import assemble_option_dict
@@ -411,6 +411,8 @@ class Documenter(object):
             else:
                 errmsg += '; the following exception was raised:\n%s' % \
                           traceback.format_exc()
+            if PY2:
+                errmsg = errmsg.decode('utf-8')
             dbg(errmsg)
             self.directive.warn(errmsg)
             self.env.note_reread()

From c005543cfd424a81056c8ef42913390ae3ed21aa Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sat, 13 Feb 2016 10:10:14 -0500
Subject: [PATCH 6/6] enable travis caching

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3f8b7ee3a..999a6acad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: python
 sudo: false
+cache:
+  directories:
+    - $HOME/.cache/pip
 python:
   - "2.6"
   - "2.7"
@@ -10,6 +13,7 @@ env:
   - DOCUTILS=0.11
   - DOCUTILS=0.12
 install:
+  - pip install -U pip
   - pip install docutils==$DOCUTILS
   - pip install -r test-reqs.txt
 before_script: flake8