bump to beta7, but might become 0.4.0

diff --git a/VERSION b/VERSION
index 378853f694d23a74cbb594136dbae3f7171fc8e3..6ac67c86b86f3d97a9778c0806e3700bd283cfc8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0beta6
+0.4.0beta7

diff --git a/doc/build/gen_docstrings.py b/doc/build/gen_docstrings.py
index b23ad1f70303f62f20dddc65a827887936acba07..e998f0d7a5be48865e22163d47e972919603d562 100644 (file)
--- a/doc/build/gen_docstrings.py
+++ b/doc/build/gen_docstrings.py
@@ -3,7 +3,7 @@ import docstring
 import re
 
 from sqlalchemy import schema, types, engine, sql, pool, orm, exceptions, databases, interfaces
-from sqlalchemy.sql import compiler
+from sqlalchemy.sql import compiler, expression
 from sqlalchemy.engine import default, strategies, threadlocal
 import sqlalchemy.orm.shard
 import sqlalchemy.ext.sessioncontext as sessioncontext
@@ -22,17 +22,19 @@ def make_all_docs():
     """generate a docstring.AbstractDoc structure."""
     print "generating docstrings"
     objects = [
-        make_doc(obj=sql,include_all_classes=True),
-        make_doc(obj=schema),
-        make_doc(obj=pool),
-        make_doc(obj=types),
         make_doc(obj=engine),
-        make_doc(obj=engine.url),
-        make_doc(obj=strategies),
         make_doc(obj=default),
+        make_doc(obj=engine.url),
         make_doc(obj=threadlocal),
+        make_doc(obj=exceptions),
+        make_doc(obj=schema),
+        #make_doc(obj=sql,include_all_classes=True),
         make_doc(obj=compiler),
+        make_doc(obj=expression,include_all_classes=True),
         make_doc(obj=interfaces),
+        make_doc(obj=pool),
+        make_doc(obj=strategies),
+        make_doc(obj=types),
         make_doc(obj=orm),
         make_doc(obj=orm.collections, classes=[orm.collections.collection,
                                                orm.collections.MappedCollection,
@@ -43,7 +45,6 @@ def make_all_docs():
         make_doc(obj=orm.query, classes=[orm.query.Query]),
         make_doc(obj=orm.session, classes=[orm.session.Session]),
         make_doc(obj=orm.shard),
-        make_doc(obj=exceptions),
         make_doc(obj=associationproxy, classes=[associationproxy.AssociationProxy]),
         make_doc(obj=orderinglist, classes=[orderinglist.OrderingList]),
         make_doc(obj=sqlsoup),

diff --git a/doc/build/genhtml.py b/doc/build/genhtml.py
index 731ea07acbd91e9e0450b574e35a830c5aff14f2..e28f86609527753f7bb243da20694f565d03bbe6 100644 (file)
--- a/doc/build/genhtml.py
+++ b/doc/build/genhtml.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import sys,re,os,shutil
+from os import path
 import cPickle as pickle
 
 sys.path = ['../../lib', './lib'] + sys.path
@@ -31,10 +32,14 @@ post_files = [
     'copyright'
 ]
 
+v = open(path.join(path.dirname(__file__), '..', '..', 'VERSION'))
+VERSION = v.readline().strip()
+v.close()
+
 parser = optparse.OptionParser(usage = "usage: %prog [options] [tests...]")
 parser.add_option("--file", action="store", dest="file", help="only generate file <file>")
 parser.add_option("--docstrings", action="store_true", dest="docstrings", help="only generate docstrings")
-parser.add_option("--version", action="store", dest="version", default=sqlalchemy.__version__, help="version string")
+parser.add_option("--version", action="store", dest="version", default=VERSION, help="version string")
 
 (options, args) = parser.parse_args()
 if options.file:
@@ -45,6 +50,7 @@ else:
 title='SQLAlchemy 0.4 Documentation'
 version = options.version
 
+
 root = toc.TOCElement('', 'root', '', version=version, doctitle=title)
 
 shutil.copy('./content/index.html', './output/index.html')