nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2018-08-27 16:49:05 +02:00
parent b49e1e81db
commit 397334d977
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1074,7 +1074,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
%D%/packages/patches/python-networkx2-reproducible-build.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/python2-rdflib-drop-sparqlwrapper.patch \
%D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \
%D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-configobj-setuptools.patch \

BIN
gnu/packages/patches/python-pillow-fix-failing-tests.patch
View File

Binary file not shown.

13
gnu/packages/python.scm
View File

@ -3930,19 +3930,17 @@ the OleFileIO module from PIL, the Python Image Library.")
(define-public python-pillow (define-public python-pillow
(package (package
(name "python-pillow") (name "python-pillow")
(version "4.3.0") (version "5.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Pillow" version)) (uri (pypi-uri "Pillow" version))
(sha256 (sha256
(base32 (base32
"09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")) "1ary9mj2ddllq3lkxgn6aac7qxqiwbcg2pacrl94py58ql9x9czq"))))
(patch-flags '("-p1" "--binary"))
(patches (search-patches "python-pillow-fix-failing-tests.patch"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-nose" ,python-nose))) `(("python-pytest" ,python-pytest)))
(inputs (inputs
`(("freetype" ,freetype) `(("freetype" ,freetype)
("lcms" ,lcms) ("lcms" ,lcms)
@ -3963,9 +3961,8 @@ the OleFileIO module from PIL, the Python Image Library.")
;; Make installed package available for running the ;; Make installed package available for running the
;; tests ;; tests
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(and (zero? (system* "python" "selftest.py" (invoke "python" "selftest.py" "--installed")
"--installed")) (invoke "python" "-m" "pytest" "-vv"))))
(zero? (system* "python" "test-installed.py"))))))
(delete 'check)))) (delete 'check))))
(home-page "https://pypi.python.org/pypi/Pillow") (home-page "https://pypi.python.org/pypi/Pillow")
(synopsis "Fork of the Python Imaging Library") (synopsis "Fork of the Python Imaging Library")