Merge branch 'master' into merge_pytestini_into_setup

pymor · Jan 16, 2017 · f927a0e · f927a0e
2 parents 0374623 + b73e239
commit f927a0e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 Sphinx>=1.4.0
 cython>=0.20.1
 docopt
-numpy>=1.8.1
+numpy>=1.8.1,<1.12
 pytest-runner>=2.7
 scipy>=0.13.3