Skip to content

Commit

Permalink
prep for 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonc committed Dec 15, 2011
1 parent a452d7c commit 161c50b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions CHANGES.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,13 +1,13 @@
Next release (on 1.0 branch) 1.0.2 (2011-12-14)
============================ ==================


Features Features
-------- --------


- Backport the ``egg:pyramid#wsgiref`` and ``egg:pyramid#cherrypy`` server - Backport the ``egg:pyramid#wsgiref`` and ``egg:pyramid#cherrypy`` server
runners from the 1.3 branch. This change is to primarily allow scaffolding 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 authors to rely on the wsgiref entry point for projects that are meant to
work on both Pyramid 1.0.2 and 1.3.X. work on both Pyramid 1.0.X and 1.3.X.


1.0.1 (2011-08-13) 1.0.1 (2011-08-13)
================== ==================
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def nothing(*arg):
# other places throughout the built documents. # other places throughout the built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.0.1' version = '1.0.2'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version


Expand Down Expand Up @@ -475,7 +475,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
# -- Options for Epub output --------------------------------------------------- # -- Options for Epub output ---------------------------------------------------


# Bibliographic Dublin Core info. # Bibliographic Dublin Core info.
epub_title = 'The Pyramid Web Application Development Framework, Version 1.0.1' epub_title = 'The Pyramid Web Application Development Framework, Version 1.0.2'
epub_author = 'Chris McDonough' epub_author = 'Chris McDonough'
epub_publisher = 'Agendaless Consulting' epub_publisher = 'Agendaless Consulting'
epub_copyright = '2008-2011' epub_copyright = '2008-2011'
Expand All @@ -492,7 +492,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
epub_identifier = '0615445675' epub_identifier = '0615445675'


# A unique identification for the text. # A unique identification for the text.
epub_uid = 'The Pyramid Web Application Development Framework, Version 1.0.1' epub_uid = 'The Pyramid Web Application Development Framework, Version 1.0.2'


# HTML files that should be inserted before the pages created by sphinx. # HTML files that should be inserted before the pages created by sphinx.
# The format is a list of tuples containing the path and title. # The format is a list of tuples containing the path and title.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
install_requires.append('simplejson') install_requires.append('simplejson')


setup(name='pyramid', setup(name='pyramid',
version='1.0.1', version='1.0.2',
description='The Pyramid web application framework, a Pylons project', description='The Pyramid web application framework, a Pylons project',
long_description=README + '\n\n' + CHANGES, long_description=README + '\n\n' + CHANGES,
classifiers=[ classifiers=[
Expand Down

0 comments on commit 161c50b

Please sign in to comment.