summaryrefslogtreecommitdiff
path: root/HACKING.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
committerChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
commitb2e8884a94d9e869bf29ea55298ad308f16ed420 (patch)
treee46bf79d1a8811ad273a40ce194d05836fcc7409 /HACKING.txt
parent7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff)
parent40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff)
downloadpyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'HACKING.txt')
-rw-r--r--HACKING.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/HACKING.txt b/HACKING.txt
index 953c386f9..bbebb5165 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -118,8 +118,8 @@ In order to add a feature to Pyramid:
- The feature must be documented in both the API and narrative documentation
(in ``docs/``).
-- The feature must work fully on the following CPython versions: 2.7, 3.4,
- and 3.5 on both UNIX and Windows.
+- The feature must work fully on the following CPython versions: 2.7, 3.4, 3.5,
+ and 3.6 on both UNIX and Windows.
- The feature must work on the latest version of PyPy.
@@ -216,7 +216,7 @@ Running Tests
Alternatively:
- $ tox -e{py27,py34,py35,pypy}-scaffolds,
+ $ tox -e{py27,py34,py35,pypy}-scaffolds
Test Coverage