diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2021-12-23 16:36:02 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2021-12-23 16:40:08 +0100 |
| commit | 8f57ff2d7463a8d46b6e1a8eb6946fe90b42ba74 (patch) | |
| tree | 504599902c14ea52b9caf8538558a6ca9c73ba1d /debian | |
| parent | b9553edb64ed86f20af06ed37f826fb4c2a11b55 (diff) | |
Add patch to turn Scikit-Learn positional args into keyword ones
For compatibility with the 1.0 series of Scikit-Learn.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0007-Turn-positional-argument-into-keyword-argument.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f11add90..a0ace48c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gudhi (3.4.1+dfsg-3) unstable; urgency=medium + + * Add patch to turn sklearn positional args into keyword ones, for + compatibility with sklearn 1.0. (Closes: #1002331) + + -- Gard Spreemann <gspr@nonempty.org> Thu, 23 Dec 2021 16:37:05 +0100 + gudhi (3.4.1+dfsg-2) unstable; urgency=medium * Fix watch file. 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 <gspr@nonempty.org> +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 |