diff options
| author | Chris McDonough <chrism@agendaless.com> | 2010-02-10 05:01:37 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2010-02-10 05:01:37 +0000 |
| commit | 4e27f95497f95d9d2e51a31e29ab952ad6743f3d (patch) | |
| tree | 6cde823bb7e2dc5331c1a4a76354a70333fabd02 | |
| parent | 927dfa0fed4390fdc2b0287cc24f305e4178725a (diff) | |
| download | pyramid-4e27f95497f95d9d2e51a31e29ab952ad6743f3d.tar.gz pyramid-4e27f95497f95d9d2e51a31e29ab952ad6743f3d.tar.bz2 pyramid-4e27f95497f95d9d2e51a31e29ab952ad6743f3d.zip | |
Prep for 1.2 final.
| -rw-r--r-- | CHANGES.txt | 5 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c44400014..7833eb35f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +1.2 (2010-02-10) +================ + +- No changes from 1.2b6. + 1.2b6 (2010-02-06) ================== diff --git a/docs/conf.py b/docs/conf.py index 53e2d671c..fb2e0adbf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting' # other places throughout the built documents. # # The short X.Y version. -version = '1.2b6' +version = '1.2' # The full version, including alpha/beta/rc tags. release = version @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2008 Agendaless Consulting and Contributors. +# Copyright (c) 2008-2010 Agendaless Consulting and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the BSD-like license at @@ -12,7 +12,7 @@ # ############################################################################## -__version__ = '1.2b6' +__version__ = '1.2' import os import sys @@ -31,7 +31,7 @@ install_requires=[ 'Paste > 1.7', # temp version pin to prevent PyPi install failure :-( 'PasteDeploy', 'PasteScript', - 'WebOb>=0.9.7', # "default_charset" + 'WebOb >= 0.9.7', # "default_charset" 'repoze.lru', 'setuptools', 'zope.component >= 3.6.0', # independent of zope.hookable |