merge 0.6 series to trunk.

1 files changed, 3 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 3d65f022e..12925a115 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ def find_packages(dir_):
 if sys.version_info < (2, 4):
     raise Exception("SQLAlchemy requires Python 2.4 or higher.")
 
-v = file(os.path.join(os.path.dirname(__file__), 'lib', 'sqlalchemy', '__init__.py'))
+v = open(os.path.join(os.path.dirname(__file__), 'lib', 'sqlalchemy', '__init__.py'))
 VERSION = re.compile(r".*__version__ = '(.*?)'", re.S).match(v.read()).group(1)
 v.close()
 
@@ -31,7 +31,8 @@ setup(name = "SQLAlchemy",
       packages = find_packages('lib'),
       package_dir = {'':'lib'},
       license = "MIT License",
-
+      tests_require = ['nose >= 0.10'],
+      test_suite = "nose.collector",
       entry_points = {
           'nose.plugins.0.10': [
               'sqlalchemy = sqlalchemy.test.noseplugin:NoseSQLAlchemy',