From 6343fef5469863d99208a336048cc2a8cba9dd52 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Dec 2016 01:09:16 +0100 Subject: [PATCH] python/pillow: Only disable failing tests There's no reason to disable ALL tests just because only one particular test module is failing. Tested on i686-linux and x86_64-linux against these Python versions: Python 2.6: The interpreter itself doesn't build Python 2.7: Successful for both architectures Python 3.3: Successful for both architectures Python 3.4: Successful for both architectures Python 3.5: Successful for both architectures Python 3.6: One of the dependencies of pillow doesn't build (pytest) Tests for PyPy still fail, which is why the doCheck attribute is only set to false if we're building for PyPy. Signed-off-by: aszlig Cc: @desiderius, @goibhniu, @prikhi --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e990295f1e0..31724a1597d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18689,9 +18689,13 @@ in { sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1"; }; - # Check is disabled because of assertion errors, see + doCheck = !isPyPy; + + # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 - doCheck = false; + postPatch = '' + rm Tests/test_imagefont.py + ''; buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose pkgs.lcms2 ]