From a4f50ea3611b4873659c348ce6e015f2d0e431d5 Mon Sep 17 00:00:00 2001
From: Gael varoquaux <gael.varoquaux@normalesup.org>
Date: Sun, 12 Sep 2010 00:23:58 +0200
Subject: [PATCH] MISC: Make sure tests always run.
And tweak setup.py
---
scikits/learn/__init__.py | 2 +-
scikits/learn/datasets/setup.py | 0
scikits/learn/setup.py | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
mode change 100755 => 100644 scikits/learn/datasets/setup.py
diff --git a/scikits/learn/__init__.py b/scikits/learn/__init__.py
index 4fa359a7c4..d0bbd6c5c4 100644
--- a/scikits/learn/__init__.py
+++ b/scikits/learn/__init__.py
@@ -31,7 +31,7 @@ try:
class NoseTester(nosetester.NoseTester):
""" Subclass numpy's NoseTester to add doctests by default
"""
- def test(self, label='fast', verbose=1, extra_argv=None,
+ def test(self, label='fast', verbose=1, extra_argv=['--exe'],
doctests=True, coverage=False):
return super(NoseTester, self).test(label=label, verbose=verbose,
extra_argv=extra_argv,
diff --git a/scikits/learn/datasets/setup.py b/scikits/learn/datasets/setup.py
old mode 100755
new mode 100644
diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index c3bcdf543d..71609c336c 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -125,7 +125,7 @@ def configuration(parent_package='', top_path=None):
config.add_subpackage('glm')
# add the test directory
- config.add_data_dir('tests')
+ config.add_subpackage('tests')
return config
--
GitLab