From 2411e4c1e1949c4f19beef9dd32bbc82820740ba Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 25 Nov 2021 17:22:42 -0500 Subject: [PATCH] python3Packages.Keras: rename to keras --- pkgs/development/python-modules/edward/default.nix | 4 ++-- .../python-modules/keras-preprocessing/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 2 +- pkgs/development/python-modules/mask-rcnn/default.nix | 4 ++-- pkgs/development/python-modules/optuna/default.nix | 4 ++-- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- pkgs/development/python-modules/umap-learn/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index ac2d5023cc97..05171c22d18e 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast -, Keras, numpy, scipy, six, tensorflow }: +, keras, numpy, scipy, six, tensorflow }: buildPythonPackage rec { pname = "edward"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # disabled for now due to Tensorflow trying to create files in $HOME: doCheck = false; - propagatedBuildInputs = [ Keras numpy scipy six tensorflow ]; + propagatedBuildInputs = [ keras numpy scipy six tensorflow ]; meta = with lib; { description = "Probabilistic programming language using Tensorflow"; diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index d62a179136f4..a0d9d4bb153d 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, six, scipy, pillow, pytest, Keras }: +{ lib, buildPythonPackage, fetchPypi, numpy, six, scipy, pillow, pytest, keras }: buildPythonPackage rec { pname = "Keras_Preprocessing"; @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest Keras + pytest keras ]; checkPhase = '' diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 28b09222b472..33004be680c2 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "Keras"; + pname = "keras"; version = "2.4.3"; src = fetchPypi { diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix index ae07e7928a6a..bab6aadfa22d 100644 --- a/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/pkgs/development/python-modules/mask-rcnn/default.nix @@ -4,7 +4,7 @@ , h5py , imgaug , ipython -, Keras +, keras , lib , matplotlib , numpy @@ -32,7 +32,7 @@ buildPythonPackage rec { h5py imgaug ipython - Keras + keras matplotlib numpy opencv3 diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index b7247083be43..6dde9ededb50 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -9,7 +9,7 @@ , xgboost , mpi4py , lightgbm -, Keras +, keras , mxnet , scikit-optimize , tensorflow @@ -49,7 +49,7 @@ buildPythonPackage rec { xgboost mpi4py lightgbm - Keras + keras mxnet scikit-optimize tensorflow diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index b43ac71ba41e..ae55ac637e97 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage, pythonOlder, python # Python libraries , numpy, tensorflow-tensorboard, absl-py -, setuptools, wheel, Keras, keras-preprocessing, google-pasta +, setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator , dill, flatbuffers-python, tblib, typing-extensions @@ -479,7 +479,7 @@ in buildPythonPackage { # Actual tests are slow and impure. # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) - checkInputs = [ Keras ]; + checkInputs = [ keras ]; checkPhase = '' ${python.interpreter} <