summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-12-31 16:14:15 -0700
committerCharles Harris <charlesr.harris@gmail.com>2015-12-31 16:14:15 -0700
commit4e669d99fdb0456502a33e56c92de66a25385a50 (patch)
treec61a1e42be844515de4b6ca54f8bbbdc3d7f56af
parentc8862d75be1f33a5408b112e4f6da32a617ef6e6 (diff)
parentf68cadd7b1c4f5c4d4d94acce63f86d279925a7a (diff)
downloadnumpy-4e669d99fdb0456502a33e56c92de66a25385a50.tar.gz
Merge pull request #6915 from rgommers/doc-nose-dependency
DOC: update min nose version in import error message
-rw-r--r--README.md2
-rw-r--r--numpy/testing/nosetester.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index e63d2718e..6031279b0 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ More information can be found at the website:
* http://www.numpy.org
-After installation, tests can be run with:
+After installation, tests can be run (if ``nose`` is installed) with:
python -c 'import numpy; numpy.test()'
diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py
index 6cf7defab..42113676a 100644
--- a/numpy/testing/nosetester.py
+++ b/numpy/testing/nosetester.py
@@ -57,7 +57,7 @@ def import_nose():
""" Import nose only when needed.
"""
fine_nose = True
- minimum_nose_version = (0, 10, 0)
+ minimum_nose_version = (1, 0, 0)
try:
import nose
except ImportError: