Merge pull request #54934 from dotlambda/keras-preprocessing-1.0.6

python.pkgs.keras-preprocessing: 1.0.5 -> 1.0.8
This commit is contained in:
Robert Schütz 2019-02-01 14:08:42 +01:00 committed by GitHub
commit 62dedf1264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions

View file

@ -1,24 +1,32 @@
{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six }:
{ lib, buildPythonPackage, fetchPypi, numpy, six, scipy, pillow, pytest, Keras }:
buildPythonPackage rec {
pname = "Keras_Preprocessing";
version = "1.0.5";
version = "1.0.8";
src = fetchPypi {
inherit pname version;
sha256 = "ef2e482c4336fcf7180244d06f4374939099daa3183816e82aee7755af35b754";
sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d";
};
# Cyclic dependency: keras-preprocessing requires keras, which requires keras-preprocessing
postPatch = ''
sed -i "s/keras>=[^']*//" setup.py
propagatedBuildInputs = [
# required
numpy six
# optional
scipy pillow
];
checkInputs = [
pytest Keras
];
checkPhase = ''
py.test tests/
'';
# No tests in PyPI tarball
# Cyclic dependency: keras-preprocessing's tests require Keras, which requires keras-preprocessing
doCheck = false;
propagatedBuildInputs = [ numpy scipy six ];
meta = with lib; {
description = "Easy data preprocessing and data augmentation for deep learning models";
homepage = https://github.com/keras-team/keras-preprocessing;

View file

@ -25,14 +25,6 @@ buildPythonPackage rec {
keras-applications keras-preprocessing
];
# Keras 2.2.2 expects older versions of keras_applications
# and keras_preprocessing. These substitutions can be removed
# for for the next Keras release.
postPatch = ''
substituteInPlace setup.py --replace "keras_applications==1.0.4" "keras_applications==1.0.5"
substituteInPlace setup.py --replace "keras_preprocessing==1.0.2" "keras_preprocessing==1.0.3"
'';
# Couldn't get tests working
doCheck = false;