Permalink
Browse files

prep for 1.2.4

  • Loading branch information...
1 parent 07cada3 commit b5e035a4016cfa5ca592ce5bf1befcf4b2f6d796 @mcdonc mcdonc committed Dec 6, 2011
Showing with 7 additions and 4 deletions.
  1. +5 −2 CHANGES.txt
  2. +1 −1 docs/conf.py
  3. +1 −1 setup.py
View
@@ -1,12 +1,15 @@
-Next Release
-============
+1.2.4 (2011-12-06)
+==================
Features
--------
- ``bpython`` interpreter compatibility in ``pshell``. See the "Command-Line
Pyramid" narrative docs chapter for more information.
+Bug Fixes
+---------
+
- Prevent a scaffold rendering from being named ``site`` (conflicts with
Python internal site.py).
View
@@ -94,7 +94,7 @@ def nothing(*arg):
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2.3'
+version = '1.2.4'
# The full version, including alpha/beta/rc tags.
release = version
View
@@ -59,7 +59,7 @@
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.2.3',
+ version='1.2.4',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,

0 comments on commit b5e035a

Please sign in to comment.