Merge master into better-autodoc-skip-member

.gitignore

@@ -1,8 +1,10 @@
 *.pyc
 *.egg
 *.so
+*.swp
 
 .dir-locals.el
+.mypy_cache/
 .ropeproject/
 TAGS
 .tags
@@ -18,3 +20,4 @@ Sphinx.egg-info/
 doc/_build/
 tests/.coverage
 tests/build/
+utils/regression_test.js

.travis.yml

@@ -1,16 +1,38 @@
 language: python
 sudo: false
+cache:
+  directories:
+    - $HOME/.cache/pip
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
+  - "nightly"
   - "pypy"
 env:
-  - DOCUTILS=0.11
-  - DOCUTILS=0.12
+  global:
+    - TEST='-v --with-timer --timer-top-n 25'
+    - PYTHONFAULTHANDLER=x
+    - PYTHONWARNINGS=all
+  matrix:
+    - DOCUTILS=0.11
+    - DOCUTILS=0.12
+addons:
+  apt:
+    packages:
+    - graphviz
+    - texlive-latex-recommended
+    - texlive-latex-extra
+    - texlive-fonts-recommended
+    - texlive-fonts-extra
+    - texlive-xetex
+    - lmodern
 install:
+  - pip install -U pip setuptools
   - pip install docutils==$DOCUTILS
   - pip install -r test-reqs.txt
-before_script: flake8
-script: make test
+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

AUTHORS

@@ -11,6 +11,7 @@ Other co-maintainers:
 * Rob Ruana <@RobRuana>
 * Robert Lehmann <@lehmannro>
 * Roland Meister <@rolmei>
+* Takeshi Komiya <@tk0miya>
 
 Other contributors, listed alphabetically, are:
 
@@ -19,17 +20,18 @@ Other contributors, listed alphabetically, are:
 * Jakob Lykke Andersen -- Rewritten C++ domain
 * Henrique Bastos -- SVG support for graphviz extension
 * Daniel Bültmann -- todo extension
+* Jean-François Burnol -- LaTeX improvements
 * Etienne Desautels -- apidoc module
 * Michael Droettboom -- inheritance_diagram extension
 * Charles Duffy -- original graphviz extension
 * Kevin Dunn -- MathJax extension
 * Josip Dzolonga -- coverage builder
+* Buck Evan -- dummy builder
 * Hernan Grecco -- search improvements
 * Horst Gutmann -- internationalization support
 * Martin Hans -- autodoc improvements
 * Doug Hellmann -- graphviz improvements
-* Timotheus Kampik - stop words language fix
-* Takeshi Komiya -- numref feature
+* Timotheus Kampik - JS theme & search enhancements
 * Dave Kuhlman -- original LaTeX writer
 * Blaise Laflamme -- pyramid theme
 * Thomas Lamb -- linkcheck builder
@@ -40,24 +42,31 @@ Other contributors, listed alphabetically, are:
 * Martin Mahner -- nature theme
 * Will Maier -- directory HTML builder
 * Jacob Mason -- websupport library (GSOC project)
+* Glenn Matthews -- python domain signature improvements
 * Roland Meister -- epub builder
 * Ezio Melotti -- collapsible sidebar JavaScript
+* Bruce Mitchener -- Minor epub improvement
 * Daniel Neuhäuser -- JavaScript domain, Python 3 support (GSOC)
 * Christopher Perkins -- autosummary integration
 * Benjamin Peterson -- unittests
-* T. Powers -- HTML output improvements
+* \T. Powers -- HTML output improvements
 * Jeppe Pihl -- literalinclude improvements
 * Rob Ruana -- napoleon extension
 * Stefan Seefeld -- toctree improvements
-* Shibukawa Yoshiki -- pluggable search API and Japanese search
+* Gregory Szorc -- performance improvements
+* Shibukawa Yoshiki -- pluggable search API and Japanese search, epub3 builder improvements
+* Taku Shimizu -- epub3 builder
 * Antonio Valentino -- qthelp builder
+* Filip Vavera -- napoleon todo directive
 * Pauli Virtanen -- autodoc improvements, autosummary extension
 * Stefan van der Walt -- autosummary extension
 * Thomas Waldmann -- apidoc module fixes
 * John Waltman -- Texinfo builder
 * Barry Warsaw -- setup command improvements
 * Sebastian Wiesner -- image handling, distutils support
+* Michael Wilson -- Intersphinx HTTP basic auth support
 * Joel Wurtz -- cellspanning support in LaTeX
+* Hong Xu -- svg support in imgmath extension and various bug fixes
 
 Many thanks for all contributions!