python3Packages.imageio: 2.4.1 -> 2.5.0

3 files changed, 19 insertions, 7 deletions

diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index 8977a7868542..f72698fd0d13 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -13,10 +13,12 @@ buildPythonPackage rec {
     inherit pname version;
   };
 
+  disabled = !isPy3k;
+
   # No test infrastructure in repository.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "FFMPEG wrapper for Python";
     homepage = https://github.com/imageio/imageio-ffmpeg;
     license = licenses.bsd2;
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index de8380280670..f7b3ff63c53c 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -1,28 +1,34 @@
 { stdenv
 , buildPythonPackage
+, pathlib
 , fetchPypi
 , pillow
 , psutil
+, imageio-ffmpeg
 , pytest
 , numpy
 , isPy3k
+, ffmpeg
 , futures
 , enum34
 }:
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchPypi {
-    sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n";
+    sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2";
     inherit pname version;
   };
 
-  checkInputs = [ pytest psutil ];
+  checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
+    imageio-ffmpeg ffmpeg
+    ];
   propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
     futures
     enum34
+    pathlib
   ];
 
   checkPhase = ''
@@ -34,8 +40,12 @@ buildPythonPackage rec {
 
   # For some reason, importing imageio also imports xml on Nix, see
   # 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 = ''
-    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; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76bac51ec19f..c31f10167f05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2794,7 +2794,7 @@ in {
 
   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 { };