diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-27 16:49:05 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-27 16:49:05 +0200 |
| commit | 397334d9777592176608184adc5e59d2494719ea (patch) | |
| tree | eeacb707ceb55f4e2991306746ca8876658f09cc /gnu | |
| parent | b49e1e81db2234ea408b903d1cdf9c93434e237c (diff) | |
| download | guix-397334d9777592176608184adc5e59d2494719ea.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-pillow-fix-failing-tests.patch | bin | 112373 -> 0 bytes | |||
| -rw-r--r-- | gnu/packages/python.scm | 13 |
3 files changed, 5 insertions, 9 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 0a593fac2c..0c74914a16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1074,7 +1074,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-networkx2-reproducible-build.patch \ - %D%/packages/patches/python-pillow-fix-failing-tests.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ 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 --- a/gnu/packages/patches/python-pillow-fix-failing-tests.patch +++ /dev/null Binary files differdiff --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") |