summaryrefslogtreecommitdiff
path: root/RELEASING.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
committerMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
commit1fde5f47b8b6208a25e951c6d3887cc73cc3696e (patch)
tree1975f4d89d0422aaabd09b9bf94ac0da93534f8d /RELEASING.txt
parentff0da73a8922b5e82c676715078c7b9e60a6a1da (diff)
parent2d45def603f038a8533eb9790640982012c0be30 (diff)
downloadpyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.gz
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.bz2
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.zip
Merge branch 'master' into pserve-watch-files
Diffstat (limited to 'RELEASING.txt')
-rw-r--r--RELEASING.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/RELEASING.txt b/RELEASING.txt
index 4690fbd37..73cf38aa7 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -33,8 +33,8 @@ Prepare new release branch
- Run tests on Windows if feasible.
-- Make sure all scaffold tests pass (CPython 2.7, 3.4, and 3.5, and PyPy on
- UNIX; this doesn't work on Windows):
+- Make sure all scaffold tests pass (CPython 2.7, 3.4, 3.5, and 3.6, and PyPy
+ on UNIX; this doesn't work on Windows):
$ ./scaffoldtests.sh