summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-02 03:12:44 -0500
committerChris McDonough <chrism@plope.com>2012-03-02 03:12:44 -0500
commitf5a1a3cf957001ee338ee02502a1a0654fb694ca (patch)
tree1c1af377555cf8d03612b4a826cc5b8783969fc1 /docs
parent8114e3a023aa2c37e99acddfe4e697ee5cc180ed (diff)
parent3a14206e0f03fe24fa9a6611097230607332184d (diff)
downloadpyramid-f5a1a3cf957001ee338ee02502a1a0654fb694ca.tar.gz
pyramid-f5a1a3cf957001ee338ee02502a1a0654fb694ca.tar.bz2
pyramid-f5a1a3cf957001ee338ee02502a1a0654fb694ca.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py2
-rw-r--r--docs/whatsnew-1.3.rst15
2 files changed, 9 insertions, 8 deletions
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.