summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2014-05-01 20:54:41 +0900
committershimizukawa <shimizukawa@gmail.com>2014-05-01 20:54:41 +0900
commit5c58fdec4a4ca31d2648ba1e85d492a27b3aeae5 (patch)
tree1501f875fc7300986781ca290108fa77150c7c02
parent6759ba4b68bda60626ebb1a69a0194de0b762485 (diff)
downloadsphinx-5c58fdec4a4ca31d2648ba1e85d492a27b3aeae5.tar.gz
Add Python-3.4 support
-rw-r--r--CHANGES1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7400c644..e341afcd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Incompatible changes
New features
------------
+* Add support for Python 3.4.
* Added ``sphinx.ext.napoleon`` extension for NumPy and Google style docstring
support.
* PR#214: Added stemming support for 14 languages, so that the built-in document
diff --git a/tox.ini b/tox.ini
index 98f26882..47ee4986 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist=py26,py27,py32,py33,pypy,du11,du10
+envlist=py26,py27,py32,py33,py34,pypy,du11,du10
[testenv]
deps=