diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix index 915b27cb4cd3..422de794e31b 100644 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ b/pkgs/development/python-modules/numpy-scipy-support.nix @@ -16,30 +16,9 @@ # .test() function, which will run the test suite. checkPhase = '' runHook preCheck - - _python=${python}/bin/${python.executable} - - # We will "install" into a temp directory, so that we can run the - # tests (see below). - install_dir="$TMPDIR/test_install" - install_lib="$install_dir/lib/${python.libPrefix}/site-packages" - mkdir -p $install_dir - $_python setup.py install \ - --install-lib=$install_lib \ - --old-and-unmanageable \ - --prefix=$install_dir > /dev/null - - # Create a directory in which to run tests (you get an error if you try to - # import the package when you're in the current directory). - mkdir $TMPDIR/run_tests - pushd $TMPDIR/run_tests > /dev/null - # Temporarily add the directory we installed in to the python path - # (not permanently, or this pythonpath will wind up getting exported), - # and run the test suite. - PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \ - 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' - popd > /dev/null - + pushd dist + ${python.interpreter} -c 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' + popd runHook postCheck ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51bcb69170d7..eb58a9141f0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10565,8 +10565,6 @@ let inherit (support) preBuild checkPhase; - setupPyBuildFlags = ["-i" "--fcompiler='gnu95'"]; - buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ support.openblas ];