nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 03:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3Packages.imageio: 2.4.1 -> 2.5.0

Browse Source
This commit is contained in:
Philipp Middendorf 2019-02-21 09:40:41 +01:00
parent 89401b0e3e
commit 47519a1e4e
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/imageio-ffmpeg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy3k , isPy3k
@ -13,10 +13,12 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
}; };
disabled = !isPy3k;
# No test infrastructure in repository. # No test infrastructure in repository.
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with lib; {
description = "FFMPEG wrapper for Python"; description = "FFMPEG wrapper for Python";
homepage = https://github.com/imageio/imageio-ffmpeg; homepage = https://github.com/imageio/imageio-ffmpeg;
license = licenses.bsd2; license = licenses.bsd2;

18
pkgs/development/python-modules/imageio/default.nix
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; {

2
pkgs/top-level/python-packages.nix
View File

@ -2794,7 +2794,7 @@ in {
imageio = callPackage ../development/python-modules/imageio { }; imageio = callPackage ../development/python-modules/imageio { };
imageio-ffmpeg = disabledIf isPy27 (callPackage ../development/python-modules/imageio-ffmpeg { }); imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { };
imgaug = callPackage ../development/python-modules/imgaug { }; imgaug = callPackage ../development/python-modules/imgaug { };