Merge pull request #56135 from plapadoo/imageio-update

python3Packages.imageio: 2.4.1 -> 2.5.0
This commit is contained in:
Robert Schütz 2019-02-22 12:26:29 +01:00 committed by GitHub
commit 76edd961f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 4 deletions

View file

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
}:
buildPythonPackage rec {
pname = "imageio-ffmpeg";
version = "0.2.0";
src = fetchPypi {
sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib";
inherit pname version;
};
disabled = !isPy3k;
# No test infrastructure in repository.
doCheck = false;
meta = with lib; {
description = "FFMPEG wrapper for Python";
homepage = https://github.com/imageio/imageio-ffmpeg;
license = licenses.bsd2;
maintainers = [ maintainers.pmiddend ];
};
}

View file

@ -1,28 +1,34 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, pathlib
, fetchPypi , fetchPypi
, pillow , pillow
, psutil , psutil
, imageio-ffmpeg
, pytest , pytest
, numpy , numpy
, isPy3k , isPy3k
, ffmpeg
, futures , futures
, enum34 , enum34
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "imageio"; pname = "imageio";
version = "2.4.1"; version = "2.5.0";
src = fetchPypi { src = fetchPypi {
sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2";
inherit pname version; inherit pname version;
}; };
checkInputs = [ pytest psutil ]; checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
imageio-ffmpeg ffmpeg
];
propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
futures futures
enum34 enum34
pathlib
]; ];
checkPhase = '' checkPhase = ''
@ -34,8 +40,12 @@ buildPythonPackage rec {
# For some reason, importing imageio also imports xml on Nix, see # For some reason, importing imageio also imports xml on Nix, see
# https://github.com/imageio/imageio/issues/395 # https://github.com/imageio/imageio/issues/395
# Also, there are tests that test the downloading of ffmpeg if it's not installed.
# "Uncomment" those by renaming.
postPatch = '' postPatch = ''
substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"" substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\","
substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed'
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -2794,6 +2794,8 @@ in {
imageio = callPackage ../development/python-modules/imageio { }; imageio = callPackage ../development/python-modules/imageio { };
imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { };
imgaug = callPackage ../development/python-modules/imgaug { }; imgaug = callPackage ../development/python-modules/imgaug { };
inflection = callPackage ../development/python-modules/inflection { }; inflection = callPackage ../development/python-modules/inflection { };