From 8f57ff2d7463a8d46b6e1a8eb6946fe90b42ba74 Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Thu, 23 Dec 2021 16:36:02 +0100 Subject: Add patch to turn Scikit-Learn positional args into keyword ones For compatibility with the 1.0 series of Scikit-Learn. --- ...positional-argument-into-keyword-argument.patch | 23 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 debian/patches/0007-Turn-positional-argument-into-keyword-argument.patch (limited to 'debian/patches') diff --git a/debian/patches/0007-Turn-positional-argument-into-keyword-argument.patch b/debian/patches/0007-Turn-positional-argument-into-keyword-argument.patch new file mode 100644 index 00000000..109e18ee --- /dev/null +++ b/debian/patches/0007-Turn-positional-argument-into-keyword-argument.patch @@ -0,0 +1,23 @@ +From: Gard Spreemann +Date: Thu, 23 Dec 2021 16:33:25 +0100 +Subject: Turn positional argument into keyword argument + +After the 0.24.x series, Scikit-Learn got rid of all of most of its +positional arguments in favor of keyword ones. +--- + src/python/gudhi/point_cloud/knn.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/gudhi/point_cloud/knn.py b/src/python/gudhi/point_cloud/knn.py +index 994be3b..829bf1b 100644 +--- a/src/python/gudhi/point_cloud/knn.py ++++ b/src/python/gudhi/point_cloud/knn.py +@@ -111,7 +111,7 @@ class KNearestNeighbors: + nargs = { + k: v for k, v in self.params.items() if k in {"p", "n_jobs", "metric_params", "algorithm", "leaf_size"} + } +- self.nn = NearestNeighbors(self.k, metric=self.metric, **nargs) ++ self.nn = NearestNeighbors(n_neighbors=self.k, metric=self.metric, **nargs) + self.nn.fit(X) + + if self.params["implementation"] == "hnsw": diff --git a/debian/patches/series b/debian/patches/series index 8479e6fb..5b7f187e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0005-Disable-Sphinx.patch 0006-Install-Python-module-in-correct-location.patch 0007-Move-towards-reproducible-builds.patch +0007-Turn-positional-argument-into-keyword-argument.patch -- cgit v1.2.3