diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-12 23:16:37 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-12 23:16:37 -0400 |
| commit | 63f65dbfcb5e7ef7864f8a954849597ba07a0299 (patch) | |
| tree | 8bdd4f1d23ab2823aebf10217578853284f9737a | |
| parent | 6a7931ff13bff5be1918a3d8fe3ce4a7135454cb (diff) | |
| download | pyramid-63f65dbfcb5e7ef7864f8a954849597ba07a0299.tar.gz pyramid-63f65dbfcb5e7ef7864f8a954849597ba07a0299.tar.bz2 pyramid-63f65dbfcb5e7ef7864f8a954849597ba07a0299.zip | |
prep for 1.2
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ac3b9aafc..21ea2bb4a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -Next release -============ +1.2 (2011-09-12) +================ Features -------- diff --git a/docs/conf.py b/docs/conf.py index a35dfcfe8..71c4f58d4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.2b3' +version = '1.2' # The full version, including alpha/beta/rc tags. release = version @@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.2b3', + version='1.2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |