summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-13 12:54:42 -0800
committerGitHub <noreply@github.com>2016-12-13 12:54:42 -0800
commit884bcdc628e7144abf8e1cd1cde1ed3019e7e699 (patch)
tree98869f62e927311cb52bb8c2fde3a01fd8a4f45d /docs/narr/introduction.rst
parent760cf2c1c6b0e5e098528d9229809a46c0a9d24d (diff)
parent6421f4c7559205e125a1c7218f711d6f6ecaf85c (diff)
downloadpyramid-884bcdc628e7144abf8e1cd1cde1ed3019e7e699.tar.gz
pyramid-884bcdc628e7144abf8e1cd1cde1ed3019e7e699.tar.bz2
pyramid-884bcdc628e7144abf8e1cd1cde1ed3019e7e699.zip
Merge branch 'master' into pcreate-to-cookiecutter
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