summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HACKING.txt8
-rw-r--r--HISTORY.txt4
-rw-r--r--RELEASING.txt14
3 files changed, 15 insertions, 11 deletions
diff --git a/HACKING.txt b/HACKING.txt
index c838fda22..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
-------------
diff --git a/HISTORY.txt b/HISTORY.txt
index c30bb2711..68ddb3a90 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,6 +1,8 @@
1.5 (2014-04-08)
================
+- Python 3.4 compatibility.
+
- Avoid crash in ``pserve --reload`` under Py3k, when iterating over possibly
mutated ``sys.modules``.
@@ -1130,6 +1132,8 @@ Bug Fixes
Features
--------
+- Python 3.3 compatibility.
+
- Configurator.add_directive now accepts arbitrary callables like partials or
objects implementing ``__call__`` which dont have ``__name__`` and
``__doc__`` attributes. See https://github.com/Pylons/pyramid/issues/621
diff --git a/RELEASING.txt b/RELEASING.txt
index 87ff62c53..fa4ebab5b 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -15,7 +15,7 @@ Releasing Pyramid
- Run tests on Windows if feasible.
-- Make sure all scaffold tests pass (Py 2.6, 2.7, 3.2, 3.3, 3.4, pypy, and
+- Make sure all scaffold tests pass (Py 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, pypy, and
pypy3 on UNIX; this doesn't work on Windows):
$ ./scaffoldtests.sh
@@ -69,22 +69,22 @@ Releasing Pyramid
Announcement template
----------------------
-Pyramid 1.1.X has been released.
+Pyramid 1.X.X has been released.
Here are the changes:
<<changes>>
-A "What's New In Pyramid 1.1" document exists at
-http://docs.pylonsproject.org/projects/pyramid/1.1/whatsnew-1.1.html .
+A "What's New In Pyramid 1.X" document exists at
+http://docs.pylonsproject.org/projects/pyramid/1.X/whatsnew-1.X.html .
-You will be able to see the 1.1 release documentation (across all
+You will be able to see the 1.X release documentation (across all
alphas and betas, as well as when it eventually gets to final release)
-at http://docs.pylonsproject.org/projects/pyramid/1.1/ .
+at http://docs.pylonsproject.org/projects/pyramid/1.X/ .
You can install it via PyPI:
- easy_install Pyramid==1.1a4
+ easy_install Pyramid==1.X
Enjoy, and please report any issues you find to the issue tracker at
https://github.com/Pylons/pyramid/issues