From 8cf2205b43f0cd87b7b9e81c9d1ae3cb6a768c35 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Jan 2025 16:30:27 +0900 Subject: [PATCH 1/2] python312Packages.keras-applications: remove keras-applications has been removed because it's abandoned since 2022 --- .../keras-applications/default.nix | 37 ------------------- .../python-modules/tensorflow/bin.nix | 2 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/keras-applications/default.nix diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix deleted file mode 100644 index cdb3beb6a4031..0000000000000 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - numpy, - h5py, -}: - -buildPythonPackage rec { - pname = "keras-applications"; - version = "1.0.8"; - - src = fetchPypi { - pname = "Keras_Applications"; - inherit version; - sha256 = "5579f9a12bcde9748f4a12233925a59b93b73ae6947409ff34aa2ba258189fe5"; - }; - - # Cyclic dependency: keras-applications requires keras, which requires keras-applications - postPatch = '' - sed -i "s/keras>=[^']*//" setup.py - ''; - - # No tests in PyPI tarball - doCheck = false; - - propagatedBuildInputs = [ - numpy - h5py - ]; - - meta = with lib; { - description = "Reference implementations of popular deep learning models"; - homepage = "https://github.com/keras-team/keras-applications"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index cb709c98b7209..43a5a28c96ca3 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -29,7 +29,6 @@ cudaPackages, zlib, python, - keras-applications, keras-preprocessing, addDriverRunpath, astunparse, @@ -90,7 +89,6 @@ buildPythonPackage rec { wrapt tensorflow-estimator-bin tensorboard - keras-applications keras-preprocessing h5py ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 926b83659415e..64b4f90cc600b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -324,6 +324,7 @@ mapAliases ({ Kajiki = kajiki; # added 2023-02-19 keepkey_agent = keepkey-agent; # added 2024-01-06 Keras = keras; # added 2021-11-25 + keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12 keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39b7f679e2c65..8c493ac5f7569 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6943,8 +6943,6 @@ self: super: with self; { keke = callPackage ../development/python-modules/keke { }; - keras-applications = callPackage ../development/python-modules/keras-applications { }; - keras = callPackage ../development/python-modules/keras { }; keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; From 59fe6abb331833df2deb560ff4a561dbe4b1afa3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Jan 2025 16:33:07 +0900 Subject: [PATCH 2/2] python312Packages.keras-preprocessing: remove keras-preprocessing has been removed because it's abandoned since 2024 --- .../keras-preprocessing/default.nix | 49 ------------------- .../python-modules/tensorflow/bin.nix | 2 - .../python-modules/tensorflow/default.nix | 3 -- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/keras-preprocessing/default.nix diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix deleted file mode 100644 index 0e9b0bf5187f2..0000000000000 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - numpy, - six, - scipy, - pillow, - pytest, - keras, -}: - -buildPythonPackage rec { - pname = "keras-preprocessing"; - version = "1.1.2"; - - src = fetchPypi { - pname = "Keras_Preprocessing"; - inherit version; - sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; - }; - - propagatedBuildInputs = [ - # required - numpy - six - # optional - scipy - pillow - ]; - - nativeCheckInputs = [ - pytest - keras - ]; - - checkPhase = '' - py.test tests/ - ''; - - # Cyclic dependency: keras-preprocessing's tests require Keras, which requires keras-preprocessing - doCheck = false; - - meta = with lib; { - description = "Easy data preprocessing and data augmentation for deep learning models"; - homepage = "https://github.com/keras-team/keras-preprocessing"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 43a5a28c96ca3..2ca3c4c1dc616 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -29,7 +29,6 @@ cudaPackages, zlib, python, - keras-preprocessing, addDriverRunpath, astunparse, flatbuffers, @@ -89,7 +88,6 @@ buildPythonPackage rec { wrapt tensorflow-estimator-bin tensorboard - keras-preprocessing h5py ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ac2430d1a2b64..0201564e683f0 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -22,7 +22,6 @@ packaging, setuptools, wheel, - keras-preprocessing, google-pasta, opt-einsum, astunparse, @@ -197,7 +196,6 @@ let google-pasta grpcio h5py - keras-preprocessing numpy opt-einsum packaging @@ -648,7 +646,6 @@ buildPythonPackage { google-pasta grpcio h5py - keras-preprocessing numpy opt-einsum packaging diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 64b4f90cc600b..944a94884b37a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -325,6 +325,7 @@ mapAliases ({ keepkey_agent = keepkey-agent; # added 2024-01-06 Keras = keras; # added 2021-11-25 keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12 + keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12 keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c493ac5f7569..fbe1efea09842 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6945,8 +6945,6 @@ self: super: with self; { keras = callPackage ../development/python-modules/keras { }; - keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { }; keyboard = callPackage ../development/python-modules/keyboard { };