Permalink
Browse files

prep for 1.2.5

  • Loading branch information...
1 parent 210f7d6 commit 02ad73df386ffbf1affbd92df839adf838474cbd @mcdonc mcdonc committed Dec 15, 2011
Showing with 7 additions and 7 deletions.
  1. +3 −3 CHANGES.txt
  2. +3 −3 docs/conf.py
  3. +1 −1 setup.py
View
6 CHANGES.txt
@@ -1,10 +1,10 @@
-Next release
-============
+1.2.5 (2011-12-14)
+==================
- Backport the ``egg:pyramid#wsgiref`` and ``egg:pyramid#cherrypy`` server
runners from the 1.3 branch. This change is to primarily allow scaffolding
authors to rely on the wsgiref entry point for projects that are meant to
- work on both Pyramid 1.2.5 and 1.3.X.
+ work on both Pyramid 1.2.X and 1.3.X.
1.2.4 (2011-12-06)
==================
View
6 docs/conf.py
@@ -80,7 +80,7 @@ def nothing(*arg):
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2.4'
+version = '1.2.5'
# The full version, including alpha/beta/rc tags.
release = version
@@ -475,7 +475,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
# -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info.
-epub_title = 'The Pyramid Web Application Development Framework, Version 1.2.3'
+epub_title = 'The Pyramid Web Application Development Framework, Version 1.2.5'
epub_author = 'Chris McDonough'
epub_publisher = 'Agendaless Consulting'
epub_copyright = '2008-2011'
@@ -492,7 +492,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
epub_identifier = '0615445675'
# A unique identification for the text.
-epub_uid = 'The Pyramid Web Application Development Framework, Version 1.2.3'
+epub_uid = 'The Pyramid Web Application Development Framework, Version 1.2.5'
# HTML files that should be inserted before the pages created by sphinx.
# The format is a list of tuples containing the path and title.
View
2 setup.py
@@ -59,7 +59,7 @@
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.2.4',
+ version='1.2.5',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,

0 comments on commit 02ad73d

Please sign in to comment.