diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rw-r--r-- | debian/patches/0009-Keep-POT-optional.patch | 24 | ||||
-rw-r--r-- | debian/patches/0009-Work-around-963955.patch (renamed from debian/patches/0010-Work-around-963955.patch) | 0 | ||||
-rw-r--r-- | debian/patches/series | 3 |
5 files changed, 10 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index f97fba48..32c44b66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gudhi (3.2.0+dfsg-3) UNRELEASED; urgency=medium + + * Enable Wasserstein Python module. (Closes: #949475) + - Depend on python3-pot. + - Drop corresponding patch. + + -- Gard Spreemann <gspr@nonempty.org> Wed, 08 Jul 2020 21:32:32 +0200 + gudhi (3.2.0+dfsg-2) unstable; urgency=medium * Add patch 0010-Work-around-963955.patch to work around FTBFS with diff --git a/debian/control b/debian/control index 184cd65b..1785c702 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: cmake (>= 3.1), pybind11-dev, python3-all-dev, python3-matplotlib, + python3-pot, python3-pybind11, python3-pytest, python3-setuptools, diff --git a/debian/patches/0009-Keep-POT-optional.patch b/debian/patches/0009-Keep-POT-optional.patch deleted file mode 100644 index 0324551a..00000000 --- a/debian/patches/0009-Keep-POT-optional.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Gard Spreemann <gspr@nonempty.org> -Date: Thu, 4 Jun 2020 14:37:55 +0200 -Subject: Keep POT optional. - ---- - src/python/gudhi/wasserstein/barycenter.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/python/gudhi/wasserstein/barycenter.py b/src/python/gudhi/wasserstein/barycenter.py -index d67bcde..e376ecc 100644 ---- a/src/python/gudhi/wasserstein/barycenter.py -+++ b/src/python/gudhi/wasserstein/barycenter.py -@@ -8,7 +8,10 @@ - # - YYYY/MM Author: Description of the modification - - --import ot -+try: -+ import ot -+except ImportError: -+ print("POT (Python Optimal Transport) package is not installed.") - import numpy as np - import scipy.spatial.distance as sc - diff --git a/debian/patches/0010-Work-around-963955.patch b/debian/patches/0009-Work-around-963955.patch index 76eeb500..76eeb500 100644 --- a/debian/patches/0010-Work-around-963955.patch +++ b/debian/patches/0009-Work-around-963955.patch diff --git a/debian/patches/series b/debian/patches/series index 80880a58..ee37db40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,4 @@ 0006-Install-Python-module-in-correct-location.patch 0007-Move-towards-reproducible-builds.patch 0008-Don-t-try-to-install-Hera.patch -0009-Keep-POT-optional.patch -0010-Work-around-963955.patch +0009-Work-around-963955.patch |