From 8ec25b86e145d0fe6e72357b5ef4252cf6da1089 Mon Sep 17 00:00:00 2001
From: Andreas Mueller <amueller@ais.uni-bonn.de>
Date: Sun, 18 Dec 2011 19:35:22 +0100
Subject: [PATCH] FIX This should fix the doctests in the datasets dir. They
take quite long, I think it's because of the svmlight loaders. So I didn't
include them in the standard make target
---
doc/datasets/index.rst | 8 --------
doc/datasets/mldata.rst | 5 +++++
doc/datasets/mldata_fixture.py | 21 +++++++++++----------
sklearn/utils/testing.py | 4 +---
4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/doc/datasets/index.rst b/doc/datasets/index.rst
index cfb6538165..b8cf553edf 100644
--- a/doc/datasets/index.rst
+++ b/doc/datasets/index.rst
@@ -1,11 +1,3 @@
-..
- For doctests:
-
- >>> import numpy as np
- >>> import os
- >>> from sklearn import datasets
- >>> datasets.mldata.urllib2 = mock_urllib2
-
.. _datasets:
=========================
diff --git a/doc/datasets/mldata.rst b/doc/datasets/mldata.rst
index 317cc714e2..337e9b1fec 100644
--- a/doc/datasets/mldata.rst
+++ b/doc/datasets/mldata.rst
@@ -1,3 +1,8 @@
+..
+ For doctests:
+
+ >>> import numpy as np
+ >>> import os
.. _mldata:
diff --git a/doc/datasets/mldata_fixture.py b/doc/datasets/mldata_fixture.py
index 056719701a..e57a2506e8 100644
--- a/doc/datasets/mldata_fixture.py
+++ b/doc/datasets/mldata_fixture.py
@@ -5,26 +5,27 @@ Mock urllib2 access to mldata.org
from os import makedirs
from os.path import join
-from sklearn import datasets
-from sklearn.utils.testing import mock_urllib2
+import numpy as np
import tempfile
-import scipy as sp
import shutil
+from sklearn import datasets
+from sklearn.utils.testing import mock_urllib2
+
def globs(globs):
# setup mock urllib2 module to avoid downloading from mldata.org
- mock_datasets = {
+ mock_dataset = {
'mnist-original': {
- 'data': sp.empty((70000, 784)),
- 'label': sp.repeat(sp.arange(10, dtype='d'), 7000),
+ 'data': np.empty((70000, 784)),
+ 'label': np.repeat(np.arange(10, dtype='d'), 7000),
},
'iris': {
- 'data': sp.empty((150, 4)),
+ 'data': np.empty((150, 4)),
},
'datasets-uci-iris': {
- 'double0': sp.empty((150, 4)),
- 'class': sp.empty((150,)),
+ 'double0': np.empty((150, 4)),
+ 'class': np.empty((150,)),
},
}
@@ -36,7 +37,7 @@ def globs(globs):
global _urllib2_ref
_urllib2_ref = datasets.mldata.urllib2
globs['_urllib2_ref'] = _urllib2_ref
- globs['mock_urllib2'] = mock_urllib2(mock_datasets)
+ datasets.mldata.urllib2 = mock_urllib2(mock_dataset)
return globs
diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
index 3fc5aaa241..df78ad2464 100644
--- a/sklearn/utils/testing.py
+++ b/sklearn/utils/testing.py
@@ -2,13 +2,11 @@
# Copyright (c) 2011 Pietro Berkes
# License: Simplified BSD
-import sys
-import warnings
+
from .fixes import savemat
import urllib2
from StringIO import StringIO
import scipy as sp
-import numpy.testing
def assert_in(obj, in_=None, out_=None):
--
GitLab