summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-15 19:43:35 -0500
committerChris McDonough <chrism@plope.com>2010-12-15 19:43:35 -0500
commit07bd035c2e8ca34580fd56c5bbacc58bb455a275 (patch)
tree10d58bea0b1da400991619a62afb2c0a2d2b87b8
parenta66a131abd893bb9e8ffd8a484f9c17ddfca5db7 (diff)
downloadpyramid-07bd035c2e8ca34580fd56c5bbacc58bb455a275.tar.gz
pyramid-07bd035c2e8ca34580fd56c5bbacc58bb455a275.tar.bz2
pyramid-07bd035c2e8ca34580fd56c5bbacc58bb455a275.zip
prep for 1.0a6
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 629769134..b237adc90 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a6 (2010-12-15)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 11727f16b..d17be253a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,7 +76,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.0a5'
+version = '1.0a6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 75f5b13dd..351f9a193 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '0.0'
+__version__ = '1.0a6'
import os
import platform