diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-11-28 20:33:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 20:33:08 -0800 |
| commit | 968bebc0d1cbb6d85eb446b41c0f4560383c3022 (patch) | |
| tree | 510ca54cbff453f52251c3ca95f4acbdd07d8360 /docs/narr | |
| parent | af01a5ac5e31a778be8d634a560983fe818746bf (diff) | |
| parent | c8a5e024478d274309935251d59cd20908a95067 (diff) | |
| download | pyramid-968bebc0d1cbb6d85eb446b41c0f4560383c3022.tar.gz pyramid-968bebc0d1cbb6d85eb446b41c0f4560383c3022.tar.bz2 pyramid-968bebc0d1cbb6d85eb446b41c0f4560383c3022.zip | |
Merge pull request #2840 from stevepiercy/master
add 3.6 support to documentation
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/install.rst | 2 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 570cb2285..c3c2ba64c 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -22,7 +22,7 @@ the following sections. .. sidebar:: Python Versions As of this writing, :app:`Pyramid` is tested against Python 2.7, - Python 3.4, Python 3.5, PyPy. + Python 3.4, Python 3.5, Python 3.6, and PyPy. :app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux, Mac OS X, and FreeBSD, as well as on Windows platforms. It is also known to 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 |