merge 0.6 series to trunk.

1 files changed, 22 insertions, 0 deletions

diff --git a/sqla_nose.py b/sqla_nose.py
new file mode 100644
index 000000000..0542b4e5d
--- /dev/null
+++ b/sqla_nose.py
@@ -0,0 +1,22 @@
+"""
+nose runner script.
+
+Only use this script if setuptools is not available, i.e. such as
+on Python 3K.  Otherwise consult README.unittests for the 
+recommended methods of running tests.
+
+"""
+
+import nose
+from sqlalchemy.test.noseplugin import NoseSQLAlchemy
+from sqlalchemy.util import py3k
+
+if __name__ == '__main__':
+    if py3k:
+        # this version breaks verbose output, 
+        # but is the only API that nose3 currently supports
+        nose.main(plugins=[NoseSQLAlchemy()])
+    else:
+        # this is the "correct" API
+        nose.main(addplugins=[NoseSQLAlchemy()])
+