From 9ada7aa2a8ccc8cd6b3d247a5038d311264852e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 15 Aug 2015 11:26:36 +0200 Subject: [PATCH] python packages scikit-learn: 0.16.1 -> 0.17b1 Some tests in scikit-learn 0.16.1 fail with the new scipy 0.16 package. This is known upstream and should be fixed in the next release. https://github.com/scikit-learn/scikit-learn/issues/5045 This commit disables the tests until the next scikit-learn release. --- pkgs/top-level/python-packages.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73c6d0ec658..27b302d7ba2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13437,27 +13437,16 @@ let scikitlearn = buildPythonPackage rec { name = "scikit-learn-${version}"; - version = "0.16.1"; + version = "0.17b1"; src = pkgs.fetchurl { url = "https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"; - sha256 = "140skabifgc7lvvj873pnzlwx0ni6q8qkrsyad2ccjb3h8rxzkih"; + sha256 = "b5965c888ae44fe3f5a1b15297e5d8e254a41d1848df99e00efc2fc643e6e8f2"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; - patches = [ - (pkgs.fetchurl { - url = "https://patch-diff.githubusercontent.com/raw/scikit-learn/scikit-learn/pull/5197.patch"; - sha256 = "1b261wcvim6s0sqmd20jylwz09g5bh3xzhagjlslmv4q50qxpvkg"; - }) - ]; - - postPatch = optionalString stdenv.isi686 '' - sed -i -e "s|test_standard_scaler_numerical_stability|_skip_test_standard_scaler_numerical_stability|g" sklearn/preprocessing/tests/test_data.py - ''; - buildPhase = '' ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95' ''; @@ -13471,7 +13460,7 @@ let homepage = http://scikit-learn.org; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; - }; + }; }; scripttest = buildPythonPackage rec {