From b0f9b7c98b42368f83721deb38fdf60c89f8fd39 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 16:39:04 +0200 Subject: [PATCH 1/4] python3Packages.persim: use finalAttrs --- pkgs/development/python-modules/persim/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 9c8dbff7ac49..b3231169d3b9 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -12,13 +12,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "persim"; version = "0.3.8"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) version; + pname = "persim"; hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0="; }; @@ -62,8 +63,8 @@ buildPythonPackage rec { meta = { description = "Distances and representations of persistence diagrams"; homepage = "https://persim.scikit-tda.org"; - changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}"; + changelog = "https://github.com/scikit-tda/persim/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From f97932818283b2d1f3ba55f99e262037d235fa72 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 16:40:41 +0200 Subject: [PATCH 2/4] python3Packages.persim: enable __structuredAttrs --- pkgs/development/python-modules/persim/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index b3231169d3b9..ec7df3e4daad 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -17,6 +17,8 @@ buildPythonPackage (finalAttrs: { version = "0.3.8"; format = "setuptools"; + __structuredAttrs = true; + src = fetchPypi { inherit (finalAttrs) version; pname = "persim"; From 824e852e22f6dcb177ff5e668fb74fc3252d13c7 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 16:47:58 +0200 Subject: [PATCH 3/4] python3Packages.persim: migrate to pyproject --- pkgs/development/python-modules/persim/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index ec7df3e4daad..1042afdc1992 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, deprecated, hopcroftkarp, joblib, @@ -15,7 +16,7 @@ buildPythonPackage (finalAttrs: { pname = "persim"; version = "0.3.8"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -25,7 +26,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ deprecated hopcroftkarp joblib From b6a8cca450ab3958ebf78b7c6de187dbf183fcec Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 16:52:16 +0200 Subject: [PATCH 4/4] python3Packages.persim: reenable disabled tests --- .../python-modules/persim/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 1042afdc1992..b54a4d1ff558 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -51,22 +51,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "persim" ]; - disabledTests = [ - # AttributeError: module 'collections' has no attribute 'Iterable' - "test_empyt_diagram_list" - "test_empty_diagram_list" - "test_fit_diagram" - "test_integer_diagrams" - "test_lists_of_lists" - "test_mixed_pairs" - "test_multiple_diagrams" - "test_n_pixels" - # https://github.com/scikit-tda/persim/issues/67 - "test_persistenceimager" - # ValueError: setting an array element with a sequence - "test_exact_critical_pairs" - ]; - meta = { description = "Distances and representations of persistence diagrams"; homepage = "https://persim.scikit-tda.org";