Merge pull request #3279 from tk0miya/py36

Testing with py36

.travis.yml

@@ -7,6 +7,7 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "nightly"
   - "pypy"
 env:
@@ -17,6 +18,16 @@ env:
   matrix:
     - DOCUTILS=0.12
     - DOCUTILS=0.13.1
+matrix:
+  exclude:
+    - python: "3.4"
+      env: DOCUTILS=0.12
+    - python: "3.5"
+      env: DOCUTILS=0.12
+    - python: nightly
+      env: DOCUTILS=0.12
+    - python: pypy
+      env: DOCUTILS=0.12
 addons:
   apt:
     packages:
@@ -31,8 +42,7 @@ install:
   - pip install -U pip setuptools
   - pip install docutils==$DOCUTILS
   - pip install -r test-reqs.txt
-before_script:
-  -  if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8; fi
 script:
-  -  if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then make style-check test-async; fi
-  -  if [[ $TRAVIS_PYTHON_VERSION != '3.5' ]]; then make test; fi
+  - flake8
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then make style-check test-async; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != '3.6' ]]; then make test; fi

doc/install.rst

@@ -79,8 +79,8 @@ sidebar and under "Quick Links", click "Windows Installer" to download.
 
 .. note::
 
-   Currently, Python offers two major versions, 2.x and 3.x. Sphinx 1.3 can run
-   under Python 2.7, 3.4, 3.5, with the recommended version being 2.7.  This
+   Currently, Python offers two major versions, 2.x and 3.x. Sphinx 1.5 can run
+   under Python 2.7, 3.4, 3.5, 3.6, with the recommended version being 2.7.  This
    chapter assumes you have installed Python 2.7.
 
 Follow the Windows installer for Python.

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=flake8,py27,py34,py35,pypy,du12,du11,du10
+envlist=flake8,py27,py34,py35,py36,pypy,du13,du12,du11
 
 [testenv]
 deps=
@@ -23,11 +23,6 @@ deps=
     simplejson
     {[testenv]deps}
 
-[testenv:du10]
-deps=
-    docutils==0.10
-    {[testenv]deps}
-
 [testenv:du11]
 deps=
     docutils==0.11
@@ -38,6 +33,11 @@ deps=
     docutils==0.12
     {[testenv]deps}
 
+[testenv:du13]
+deps=
+    docutils==0.13.1
+    {[testenv]deps}
+
 [testenv:flake8]
 deps=flake8
 commands=flake8