diff --git a/pkgs/development/python-modules/numpy-no-large-files.patch b/pkgs/development/python-modules/numpy-no-large-files.patch deleted file mode 100644 index 0eb415606d3e..000000000000 --- a/pkgs/development/python-modules/numpy-no-large-files.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- numpy/lib/tests/test_format.py 2015-08-11 12:03:43.000000000 -0500 -+++ numpy/lib/tests/test_format_no_large_files.py 2015-11-03 16:03:30.328084827 -0600 -@@ -810,32 +810,5 @@ - format.write_array_header_1_0(s, d) - assert_raises(ValueError, format.read_array_header_1_0, s) - -- --def test_large_file_support(): -- from nose import SkipTest -- if (sys.platform == 'win32' or sys.platform == 'cygwin'): -- raise SkipTest("Unknown if Windows has sparse filesystems") -- # try creating a large sparse file -- tf_name = os.path.join(tempdir, 'sparse_file') -- try: -- # seek past end would work too, but linux truncate somewhat -- # increases the chances that we have a sparse filesystem and can -- # avoid actually writing 5GB -- import subprocess as sp -- sp.check_call(["truncate", "-s", "5368709120", tf_name]) -- except: -- raise SkipTest("Could not create 5GB large file") -- # write a small array to the end -- with open(tf_name, "wb") as f: -- f.seek(5368709120) -- d = np.arange(5) -- np.save(f, d) -- # read it back -- with open(tf_name, "rb") as f: -- f.seek(5368709120) -- r = np.load(f) -- assert_array_equal(r, d) -- -- - if __name__ == "__main__": - run_module_suite() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22324178843e..7292b8126227 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11881,11 +11881,11 @@ in modules // { }; in buildPythonPackage ( rec { name = "numpy-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = pkgs.fetchurl { - url = "mirror://sourceforge/numpy/${name}.tar.gz"; - sha256 = "23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9"; + url = "https://pypi.python.org/packages/source/n/numpy/${name}.tar.gz"; + sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b"; }; disabled = isPyPy; # WIP @@ -11899,10 +11899,15 @@ in modules // { buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ support.openblas ]; - # This patch removes the test of large file support, which takes forever + # Disable failing test_f2py test. + # f2py couldn't be found by test, + # even though it was used successfully to build numpy + + # The large file support test is disabled because it takes forever # and can cause the machine to run out of disk space when run. - patchPhase = '' - patch -p0 < ${../development/python-modules/numpy-no-large-files.patch} + prePatch = '' + sed -i 's/test_f2py/donttest/' numpy/tests/test_scripts.py + sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py ''; meta = {