From 397334d9777592176608184adc5e59d2494719ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:49:05 +0200 Subject: gnu: python-pillow: Update to 5.2.0. * gnu/packages/patches/python-pillow-fix-failing-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/python.scm (python-pillow): Update to 5.2.0. [source](patches, patch-flags): Remove. [native-inputs]: Replace PYTHON-NOSE with PYTHON-PYTEST. [arguments]: Adjust custom check phase accordingly. --- .../patches/python-pillow-fix-failing-tests.patch | Bin 112373 -> 0 bytes gnu/packages/python.scm | 13 +++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-fix-failing-tests.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/python-pillow-fix-failing-tests.patch b/gnu/packages/patches/python-pillow-fix-failing-tests.patch deleted file mode 100644 index 2575d6f612..0000000000 Binary files a/gnu/packages/patches/python-pillow-fix-failing-tests.patch and /dev/null differ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a761fcfc22..6730dc3f1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3930,19 +3930,17 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "4.3.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")) - (patch-flags '("-p1" "--binary")) - (patches (search-patches "python-pillow-fix-failing-tests.patch")))) + "1ary9mj2ddllq3lkxgn6aac7qxqiwbcg2pacrl94py58ql9x9czq")))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (inputs `(("freetype" ,freetype) ("lcms" ,lcms) @@ -3963,9 +3961,8 @@ the OleFileIO module from PIL, the Python Image Library.") ;; Make installed package available for running the ;; tests (add-installed-pythonpath inputs outputs) - (and (zero? (system* "python" "selftest.py" - "--installed")) - (zero? (system* "python" "test-installed.py")))))) + (invoke "python" "selftest.py" "--installed") + (invoke "python" "-m" "pytest" "-vv")))) (delete 'check)))) (home-page "https://pypi.python.org/pypi/Pillow") (synopsis "Fork of the Python Imaging Library") -- cgit v1.2.3