RedHatTraining/pyramid.git

parent: ab128b82 | patch | commit | ignore whitespace

Chris McDonough

2011-11-20 a5175c2c0cc0e83da3bf5508a7b24d2be78b9229

prep for 1.2.2

3 files modified

	CHANGES.txt	4 ●●●●● patch \| view \| raw \| blame \| history
	docs/conf.py	2 ●●●●● patch \| view \| raw \| blame \| history
	setup.py	2 ●●●●● patch \| view \| raw \| blame \| history

 CHANGES.txt

@@ -1,5 +1,5 @@
Next release
============
1.2.2 (2011-11-20)
==================

Features
--------

 docs/conf.py

@@ -94,7 +94,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
version = '1.2.1'
version = '1.2.2'
# The full version, including alpha/beta/rc tags.
release = version


 setup.py

@@ -59,7 +59,7 @@
    install_requires.append('simplejson')
    
setup(name='pyramid',
      version='1.2.1',
      version='1.2.2',
      description=('The Pyramid web application development framework, a '
                   'Pylons project'),
      long_description=README + '\n\n' +  CHANGES,

			@@ -1,5 +1,5 @@
			Next release
			============
			1.2.2 (2011-11-20)
			==================

			Features
			--------

			@@ -94,7 +94,7 @@
			# other places throughout the built documents.
			#
			# The short X.Y version.
			version = '1.2.1'
			version = '1.2.2'
			# The full version, including alpha/beta/rc tags.
			release = version

			@@ -59,7 +59,7 @@
			install_requires.append('simplejson')

			setup(name='pyramid',
			version='1.2.1',
			version='1.2.2',
			description=('The Pyramid web application development framework, a '
			'Pylons project'),
			long_description=README + '\n\n' + CHANGES,