diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:09:59 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:09:59 -0700 |
| commit | a2dff0592714d9cde5a0a612411aa96ce9d94b3c (patch) | |
| tree | 6dac581990ba758670a8424cafe8bf31888471f7 /HACKING.txt | |
| parent | 29e1002a108d045e1f80be3137f2cde4e47ca642 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.gz pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.bz2 pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'HACKING.txt')
| -rw-r--r-- | HACKING.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/HACKING.txt b/HACKING.txt index d0f9a769e..5bbdce0c6 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, and 3.3 on both UNIX and Windows. +- 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 on the latest version of PyPy. +- The feature must work on the latest version of PyPy and PyPy3. - 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,pypy,pypy3}-scaffolds, + $ tox -e{py26,py27,py32,py33,py34,py35,pypy,pypy3}-scaffolds, Test Coverage ------------- @@ -217,7 +217,7 @@ changed to reflect the bug fix, ideally in the same commit that fixes the bug or adds the feature. To build and review docs, use the following steps. 1. In the main Pyramid checkout directory, run ``./builddocs.sh`` (which just - turns around and runs ``tox -e py2-docs,py3-docs``):: + turns around and runs ``tox -e docs``):: $ ./builddocs.sh |