Merge pull request #218197 from fabaff/persim-fix

python310Packages.persim: disable failing test, python310Packages.ripser: 0.6.1 -> 0.6.4

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

@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
+    hash = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
   };
 
   propagatedBuildInputs = [
@@ -61,13 +61,15 @@ buildPythonPackage rec {
     "test_mixed_pairs"
     "test_multiple_diagrams"
     "test_n_pixels"
+    # https://github.com/scikit-tda/persim/issues/67
+    "test_persistenceimager"
   ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "Distances and representations of persistence diagrams";
     homepage = "https://persim.scikit-tda.org";
     license = licenses.mit;
     maintainers = with maintainers; [ costrouc ];
+    broken = stdenv.isDarwin;
   };
 }

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

@@ -1,35 +1,32 @@
 { lib
 , buildPythonPackage
-, fetchpatch
-, fetchPypi
-, pythonOlder
 , cython
+, fetchPypi
 , numpy
-, scipy
-, scikit-learn
 , persim
 , pytestCheckHook
+, pythonOlder
+, scikit-learn
+, scipy
 }:
 
 buildPythonPackage rec {
   pname = "ripser";
-  version = "0.6.1";
+  version = "0.6.4";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd";
+    hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/scikit-tda/ripser.py/commit/4baa248994cee9a65d710fac91809bad8ed4e5f1.patch";
-      sha256 = "sha256-J/nxMOGOUiBueojJrUlAaXwktHDploYG/XL8/siF2kY=";
-    })
+  nativeBuildInputs = [
+    cython
   ];
 
   propagatedBuildInputs = [
-    cython
     numpy
     scipy
     scikit-learn
@@ -47,10 +44,15 @@ buildPythonPackage rec {
     echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
   '';
 
+  pythonImportsCheck = [
+    "ripser"
+  ];
+
   meta = with lib; {
     description = "A Lean Persistent Homology Library for Python";
     homepage = "https://ripser.scikit-tda.org";
+    changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }