summaryrefslogtreecommitdiff
path: root/RELEASING.txt
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2015-04-13 11:03:48 -0400
committerJohn Anderson <sontek@gmail.com>2015-04-13 11:03:48 -0400
commit17279b4da22af5caf23d402b29cef0f729408474 (patch)
tree786a5290b1440dea4cc33043cb0715113e0c0451 /RELEASING.txt
parent50a8a077f403b89ff43ad745f101213c2cfeea8f (diff)
parent46805450633291682f97e87055313fc3be477326 (diff)
downloadpyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.gz
pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.bz2
pyramid-17279b4da22af5caf23d402b29cef0f729408474.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8
Conflicts: pyramid/view.py
Diffstat (limited to 'RELEASING.txt')
-rw-r--r--RELEASING.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/RELEASING.txt b/RELEASING.txt
index 0adef552c..c22c40000 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -18,7 +18,10 @@ Releasing Pyramid
- Make sure all scaffold tests pass (Py 2.6, 2.7, 3.2, 3.3 and pypy on UNIX;
this doesn't work on Windows):
- $ python pyramid/scaffolds/tests.py
+ $ tox py3-scaffolds
+ $ tox py2-scaffolds
+ $ tox pypy-scaffolds
+ $ tox pypy3-scaffolds
- Ensure all features of the release are documented (audit CHANGES.txt or
communicate with contributors).