summaryrefslogtreecommitdiff
path: root/HACKING.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
committerChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
commit85bd2b8187c39e44285983261a74aa815f2b19ed (patch)
tree4bc2269119fbe03d1fa54171148ff0cc5d88fd93 /HACKING.txt
parentd350714a917b1a06dd4be6092e7b3da64771a4af (diff)
parent4acd85dc98fb2a43eae54d2116cc4bf383157269 (diff)
downloadpyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.gz
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.bz2
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'HACKING.txt')
-rw-r--r--HACKING.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/HACKING.txt b/HACKING.txt
index 5bbdce0c6..4b237b56c 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -124,10 +124,10 @@ 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.6, 2.7, 3.2,
- 3.3, 3.4, and 3.5 on both UNIX and Windows.
+- 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 on the latest version of PyPy and PyPy3.
+- The feature must work on the latest version of PyPy.
- The feature must not cause installation or runtime failure on App Engine.
If it doesn't cause installation or runtime failure, but doesn't actually
@@ -199,7 +199,7 @@ Running Tests
Alternately::
- $ tox -e{py26,py27,py32,py33,py34,py35,pypy,pypy3}-scaffolds,
+ $ tox -e{py27,py34,py35,pypy}-scaffolds,
Test Coverage
-------------