- finally figured out how to get setuptools version in, available

as sqlalchemy.__version__ [ticket:428]

diff --git a/CHANGES b/CHANGES
index 47346e93d9f9bb6ba70a3f0d55eb40e4603bbd5b..40f1f4e412b099056ae81d4c12bb647cc4f9fe2f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.3.9
+- general
+    - finally figured out how to get setuptools version in, available
+      as sqlalchemy.__version__ [ticket:428]
 - ext
     - iteration over dict association proxies is now dict-like, not
       InstrumentedList-like (e.g. over keys instead of values)

diff --git a/doc/build/genhtml.py b/doc/build/genhtml.py
index 3b78da7690b243b3a751935ae4353f24d08da28d..263626745de337d78cd03ef12a3140456dea4d54 100644 (file)
--- a/doc/build/genhtml.py
+++ b/doc/build/genhtml.py
@@ -4,6 +4,7 @@ import cPickle as pickle
 
 sys.path = ['../../lib', './lib/'] + sys.path
 
+import sqlalchemy
 import gen_docstrings, read_markdown, toc
 from mako.lookup import TemplateLookup
 from mako import exceptions, runtime
@@ -29,7 +30,7 @@ files = [
 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="0.3.8", help="version string")
+parser.add_option("--version", action="store", dest="version", default=sqlalchemy.__version__, help="version string")
 
 (options, args) = parser.parse_args()
 if options.file:

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 22fb10ffd965a7eac8ce624fb773855666ec9fff..e55d0ab57ef26836db5b81c668c8af66166eb58d 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -12,6 +12,22 @@ from sqlalchemy.orm import *
 from sqlalchemy.engine import create_engine
 from sqlalchemy.schema import default_metadata
 
+def __figure_version():
+    try:
+        from pkg_resources import require
+        import os
+        # NOTE: this only works when the package is either installed,
+        # or has an .egg-info directory present (i.e. wont work with raw SVN checkout)
+        info = require('sqlalchemy')[0]
+        if os.path.dirname(os.path.dirname(__file__)) == info.location:
+            return info.version
+        else:
+            return '(not installed)'
+    except:
+        return '(not installed)'
+        
+__version__ = __figure_version()
+    
 def global_connect(*args, **kwargs):
     default_metadata.connect(*args, **kwargs)
     
\ No newline at end of file

diff --git a/setup.py b/setup.py
index 270dcf2cbeb72075957f8aa1b83ae3d0ab1d2321..6b87acb336f0438c4df5d6601235dee82ce893c3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ use_setuptools()
 from setuptools import setup, find_packages
 
 setup(name = "SQLAlchemy",
-    version = "0.3.8",
+    version = "0.3.9",
     description = "Database Abstraction Library",
     author = "Mike Bayer",
     author_email = "mike_mp@zzzcomputing.com",