summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-20 11:02:07 -0500
committerChris McDonough <chrism@plope.com>2010-12-20 11:02:07 -0500
commitbd3bf1423ab441ccdca2b7e05cdb2b1b94c12223 (patch)
treeb94b2a7c2d6b2ad906c26f5f85b777c00f18a62a
parent8271f75c69036b48b4b3081dbfa53221023a9098 (diff)
downloadpyramid-bd3bf1423ab441ccdca2b7e05cdb2b1b94c12223.tar.gz
pyramid-bd3bf1423ab441ccdca2b7e05cdb2b1b94c12223.tar.bz2
pyramid-bd3bf1423ab441ccdca2b7e05cdb2b1b94c12223.zip
prep for 1.0a7
-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 3986fb7e9..e382d1db4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a7 (2010-12-20)
+==================
Terminology Changes
-------------------
diff --git a/docs/conf.py b/docs/conf.py
index d17be253a..7bcdf3a07 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.0a6'
+version = '1.0a7'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index f698f06ae..f92fe8c64 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '0.0'
+__version__ = '1.0a7'
import os
import platform