summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-16 02:55:48 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-16 02:55:48 +0000
commit131f5f3046eb71145ebeb2a05b90bd89ec829dd9 (patch)
treeb67e069cca9c47732185f48a54bd16da05c67bb2
parent9c7b472786eb94974adbf1122bb83569b3c49118 (diff)
downloadpyramid-131f5f3046eb71145ebeb2a05b90bd89ec829dd9.tar.gz
pyramid-131f5f3046eb71145ebeb2a05b90bd89ec829dd9.tar.bz2
pyramid-131f5f3046eb71145ebeb2a05b90bd89ec829dd9.zip
Prep for 1.1 final release.
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 17a2a58fd..39cb06af5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1 (2009-11-15)
+================
Internals
---------
diff --git a/docs/conf.py b/docs/conf.py
index 483177a87..b22b1cd43 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = '2008-2009, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.1b4'
+version = '1.1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index f47f8af43..79da72655 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.1b4'
+__version__ = '1.1'
import os
import sys
@@ -47,7 +47,7 @@ if sys.version_info[:2] < (2, 6):
setup(name='repoze.bfg',
version=__version__,
- description='A web framework for WSGI',
+ description='A WSGI web framework influenced by Zope, Django, and Pylons',
long_description=README + '\n\n' + CHANGES,
classifiers=[
"Intended Audience :: Developers",