Merge pull request #217923 from fabaff/mdp-fix

python310Packages.MDP: fix tests

pkgs/development/python-modules/mdp/default.nix

@@ -2,32 +2,52 @@
 , buildPythonPackage
 , fetchPypi
 , future
+, joblib
 , numpy
 , pytest
+, pythonOlder
+, scikit-learn
 }:
 
 buildPythonPackage rec {
-  pname = "MDP";
+  pname = "mdp";
   version = "3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e";
+    pname = "MDP";
+    inherit version;
+    hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4=";
   };
 
-  propagatedBuildInputs = [ future numpy ];
-
-  nativeCheckInputs = [ pytest ];
-
-  doCheck = true;
-
-  pythonImportsCheck = [ "mdp" "bimdp" ];
-
   postPatch = ''
     # https://github.com/mdp-toolkit/mdp-toolkit/issues/92
-    substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict
+    substituteInPlace mdp/utils/routines.py \
+      --replace numx.typeDict numx.sctypeDict
+    substituteInPlace mdp/test/test_NormalizingRecursiveExpansionNode.py \
+      --replace py.test"" "pytest"
+    substituteInPlace mdp/test/test_RecursiveExpansionNode.py \
+      --replace py.test"" "pytest"
   '';
 
+  propagatedBuildInputs = [
+    future
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    joblib
+    pytest
+    scikit-learn
+  ];
+
+  pythonImportsCheck = [
+    "mdp"
+    "bimdp"
+  ];
+
   checkPhase = ''
     runHook preCheck
 
@@ -39,7 +59,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library for building complex data processing software by combining widely used machine learning algorithms";
-    homepage = "https://mdp-toolkit.sourceforge.net";
+    homepage = "https://mdp-toolkit.github.io/";
+    changelog = "https://github.com/mdp-toolkit/mdp-toolkit/blob/MDP-${version}/CHANGES";
     license = licenses.bsd3;
     maintainers = with maintainers; [ nico202 ];
   };

pkgs/top-level/python-aliases.nix

@@ -123,6 +123,7 @@ mapAliases ({
   logilab_common = logilab-common; # added 2022-11-21
   loo-py = loopy; # added 2022-05-03
   Markups = markups; # added 2022-02-14
+  MDP = mdp; # added 2023-02-24
   MechanicalSoup = mechanicalsoup; # added 2021-06-01
   memcached = python-memcached; # added 2022-05-06
   mailman = throw "Please use pkgs.mailman"; # added 2022-04-29

pkgs/top-level/python-packages.nix

@@ -5816,7 +5816,7 @@ self: super: with self; {
 
   mdutils = callPackage ../development/python-modules/mdutils { };
 
-  MDP = callPackage ../development/python-modules/mdp { };
+  mdp = callPackage ../development/python-modules/mdp { };
 
   measurement = callPackage ../development/python-modules/measurement { };