diff options
author | Philipp Middendorf <pmidden+github@secure.mailbox.org> | 2018-11-04 18:32:33 +0100 |
---|---|---|
committer | Robert Schütz <rschuetz17@gmail.com> | 2018-11-04 18:32:33 +0100 |
commit | ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2 (patch) | |
tree | 846e67522205a3dadb5dcf5732d5ba2bbc03768f /pkgs/development/python-modules | |
parent | 2a3aa769a033b1b763c24188d45d409c8abc88c6 (diff) | |
download | nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.tar nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.tar.gz nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.tar.bz2 nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.tar.lz nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.tar.xz nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.tar.zst nixlib-ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2.zip |
pythonPackages.imageio: 1.6 -> 2.4.1 (#49147)
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/imageio/default.nix | 32 | ||||
-rw-r--r-- | pkgs/development/python-modules/moviepy/default.nix | 1 |
2 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index cdbcfee7180f..de8380280670 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,28 +1,42 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi +, pillow +, psutil , pytest , numpy +, isPy3k +, futures +, enum34 }: buildPythonPackage rec { pname = "imageio"; - version = "1.6"; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz"; - sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv"; + src = fetchPypi { + sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; + inherit pname version; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + checkInputs = [ pytest psutil ]; + propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ + futures + enum34 + ]; checkPhase = '' + export IMAGEIO_USERDIR="$TMP" + export IMAGEIO_NO_INTERNET="true" + export HOME="$(mktemp -d)" py.test ''; - # Tries to write in /var/tmp/.imageio - doCheck = false; + # For some reason, importing imageio also imports xml on Nix, see + # https://github.com/imageio/imageio/issues/395 + postPatch = '' + substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"" + ''; meta = with stdenv.lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 63613b516868..637c014cb1ab 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -4,6 +4,7 @@ , numpy , decorator , imageio +, isPy3k , tqdm }: |