From 77f9bbd9cc67d591a95b50310f26a8ec6721b763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Jul 2016 16:21:18 +0300
Subject: [PATCH 1/2] Travis: Run style-check with Python 3.5

Doing this with 3.5 only, because the PEP 484 annotation examples in
docs won't compile with old Python versions, causing failures.
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91ad798e7..45bf4bb40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,5 @@ install:
   - pip install -r test-reqs.txt
 before_script: flake8
 script:
-
-  -  if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then make test-async; fi
+  -  if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then make style-check test-async; fi
   -  if [[ $TRAVIS_PYTHON_VERSION != '3.5' ]]; then make test; fi

From 7cfbc2a70267422986c816f254f6abf2f323e748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Jul 2016 16:36:44 +0300
Subject: [PATCH 2/2] Fix style checks

---
 doc/ext/doctest.rst          | 2 +-
 doc/ext/inheritance.rst      | 2 +-
 tests/test_directive_code.py | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/ext/doctest.rst b/doc/ext/doctest.rst
index 3d4f66a9a..818b86007 100644
--- a/doc/ext/doctest.rst
+++ b/doc/ext/doctest.rst
@@ -182,7 +182,7 @@ The doctest extension uses the following configuration values:
 .. confval:: doctest_default_flags
 
    By default, these options are enabled:
-   
+
    - ``ELLIPSIS``, allowing you to put ellipses in the expected output that
      match anything in the actual output;
    - ``IGNORE_EXCEPTION_DETAIL``, causing everything following the leftmost
diff --git a/doc/ext/inheritance.rst b/doc/ext/inheritance.rst
index dd8d5aa99..bd287aa49 100644
--- a/doc/ext/inheritance.rst
+++ b/doc/ext/inheritance.rst
@@ -40,7 +40,7 @@ It adds this directive:
       included.
 
    .. versionchanged:: 1.5
-      Added ``caption`` option 
+      Added ``caption`` option
 
 
 New config values are:
diff --git a/tests/test_directive_code.py b/tests/test_directive_code.py
index f4abab935..175e1881e 100644
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -228,7 +228,8 @@ def test_literalinclude_file_whole_of_emptyline(app, status, warning):
     app.builder.build_all()
     latex = (app.outdir / 'Python.tex').text(encoding='utf-8').replace('\r\n', '\n')
     includes = (
-        '\\begin{sphinxVerbatim}[commandchars=\\\\\\{\\},numbers=left,firstnumber=1,stepnumber=1]\n'
+        '\\begin{sphinxVerbatim}'
+        '[commandchars=\\\\\\{\\},numbers=left,firstnumber=1,stepnumber=1]\n'
         '\n'
         '\n'
         '\n'