summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
committerMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
commit1fde5f47b8b6208a25e951c6d3887cc73cc3696e (patch)
tree1975f4d89d0422aaabd09b9bf94ac0da93534f8d /docs/narr/introduction.rst
parentff0da73a8922b5e82c676715078c7b9e60a6a1da (diff)
parent2d45def603f038a8533eb9790640982012c0be30 (diff)
downloadpyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.gz
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.bz2
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.zip
Merge branch 'master' into pserve-watch-files
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 47638579b..adad196e4 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -860,7 +860,7 @@ Every release of Pyramid has 100% statement coverage via unit and integration
tests, as measured by the ``coverage`` tool available on PyPI. It also has
greater than 95% decision/condition coverage as measured by the
``instrumental`` tool available on PyPI. It is automatically tested by Travis,
-and Jenkins on Python 2.7, Python 3.4, Python 3.5, and PyPy
+and Jenkins on Python 2.7, Python 3.4, Python 3.5, Python 3.6, and PyPy
after each commit to its GitHub repository. Official Pyramid add-ons are held
to a similar testing standard. We still find bugs in Pyramid and its official
add-ons, but we've noticed we find a lot more of them while working on other