Merge branch '1.3-branch'

5 files changed, 25 insertions, 18 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 3f5819954..574d887b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.3b2 (2012-03-02)
+==================
 
 Bug Fixes
 ---------
diff --git a/RELEASING.txt b/RELEASING.txt
index 3116d2643..c97c8ef60 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -1,17 +1,22 @@
 Releasing Pyramid
 =================
 
-- git pull
+- Do any necessary branch merges (e.g. master to branch, branch to master).
+
+- On release branch:
+
+  $ git pull
 
 - Do platform test via tox:
 
-  $ tox
+  $ tox -r
 
-- Make sure statement coverage is at 100%::
+  Make sure statement coverage is at 100%::
 
-  $ python setup.py nosetests --with-coverage
+- Run Windows tests for Python 2.6, 2.7, and 3.2 if feasible.
 
-- Make sure all scaffold tests pass:
+- Make sure all scaffold tests pass (Py 2.6, 2.7, 3.2 and pypy on UNIX; this
+  doesn't work on Windows):
 
   $ python pyramid/scaffolds/tests.py
 
@@ -37,11 +42,12 @@ Releasing Pyramid
 - Make sure PyPI long description renders (requires ``collective.dist``
   installed into your Python)::
 
-  $ python setup.py check --restructuredtext
+  $ python setup.py check -r
 
 - Create a release tag.
 
-- Release to PyPI::
+- Make sure your system Python has ``setuptools-git`` installed and release to
+  PyPI::
 
   $ python setup.py sdist register upload
 
diff --git a/docs/conf.py b/docs/conf.py
index 187b1a125..1c957162e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.3b1'
+version = '1.3b2'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index ac01bb140..cc960f8c1 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -21,13 +21,14 @@ is required.
 
 .. warning::
 
-   As of this writing (the release of Pyramid 1.3a1), if you attempt to
-   install a Pyramid project that used ``alchemy`` scaffold via ``setup.py
-   develop`` on Python 3.2, it may quit with an installation error while
-   trying to install ``Pygments``.  If this happens, please rerun the
-   ``setup.py develop`` command again and it will complete.  We're just as
-   clueless as you are as to why this happens at this point, but hopefully
-   we'll figure it out before Pyramid 1.3 leaves the alpha/beta phase.
+   As of this writing (the release of Pyramid 1.3b2), if you attempt to
+   install a Pyramid project that used the ``alchemy`` scaffold via
+   ``setup.py develop`` on Python 3.2, it will quit with an installation
+   error while trying to install ``Pygments``.  If this happens, please just
+   rerun the ``setup.py develop`` command again, and it will complete
+   successfully.  This is due to a minor bug in SQLAlchemy 0.7.5 under Python
+   3, and will be fixed in a later SQLAlchemy release.  Keep an eye on
+   http://www.sqlalchemy.org/trac/ticket/2421
 
 This feature required us to make some compromises.
 
diff --git a/setup.py b/setup.py
index 6e8119065..9dfb18a13 100644
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ if not PY3:
         ])
 
 setup(name='pyramid',
-      version='1.3b1',
+      version='1.3b2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,