From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 13 Nov 2010 16:26:05 +0000 (-0500)
Subject: - nose3 seems to support "addplugins" now
X-Git-Tag: rel_0_7b1~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c61875aa19ee622d0b90a9c4028ca6666e2aa44;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- nose3 seems to support "addplugins" now
- add a note about sqla_nose.py
---

diff --git a/README.unittests b/README.unittests
index ca76997435..6b2320907d 100644
--- a/README.unittests
+++ b/README.unittests
@@ -68,6 +68,16 @@ intersesting:
 
     $ nosetests -v
 
+ALTERNATE TEST RUNNER
+---------------------
+
+The script "sqla_nose.py" is a front-end to Nose which manually associates
+the SQLAlchemy testing plugin with Nose at runtime.   This script can run the 
+tests without any reliance upon setuptools.   In 0.7 we'll be removing the 
+Nose plugin from setup, so this will be the way going forward to run tests:
+
+    $ python sqla_nose.py -v
+
 RUNNING INDIVIDUAL TESTS
 -------------------------
 Any directory of test modules can be run at once by specifying the directory
diff --git a/sqla_nose.py b/sqla_nose.py
index ab329fd3fc..302fb5b087 100755
--- a/sqla_nose.py
+++ b/sqla_nose.py
@@ -5,7 +5,6 @@ nose runner script.
 This script is a front-end to "nosetests" which doesn't
 require that SQLA's testing plugin be installed via setuptools.
 
-
 """
 import sys
 
@@ -18,13 +17,5 @@ except ImportError:
 
 import nose
 
-
 if __name__ == '__main__':
-    py3k = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0)
-    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()])
+    nose.main(addplugins=[NoseSQLAlchemy()])