Control: tags 1150278 + patch
Control: tags 1150278 + pending
Dear maintainer,
I've prepared an NMU for gudhi (versioned as 3.13.0+dfsg-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.
* dh_python3 --no-ext-rename (Closes: #1150278)
This fixes loading the Python module, and therefore also the autopkgtest.
* Enable parallel building again.
Looking at build times when it was disabled, it tripled build times on
the typical quad-core buildds. The riscv64 buildds have 4 slow cores and
16 GB RAM, I'd hope that this will reduce the build time there from 29 hours
to around 10 hours.
If Ubuntu or anyone else still has problems today due to underresourced
buildds, then limiting parallelism based on actually measured memory
usage would be an option.
* Architecture: any, and remove workarounds for 32-bit architectures
that are no longer supported by python3-pot
Getting rid of manual architecture lists removes the need to maintain them.
cu
Adrian
diffstat for gudhi-3.13.0+dfsg gudhi-3.13.0+dfsg
changelog | 10 ++++++++++
control | 4 ++--
rules | 25 ++-----------------------
3 files changed, 14 insertions(+), 25 deletions(-)
diff -Nru gudhi-3.13.0+dfsg/debian/changelog gudhi-3.13.0+dfsg/debian/changelog
--- gudhi-3.13.0+dfsg/debian/changelog 2026-10-02 13:33:24.000000000 +0300
+++ gudhi-3.13.0+dfsg/debian/changelog 2026-10-21 22:40:44.000000000 +0300
@@ -1,3 +1,13 @@
+gudhi (3.13.0+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * dh_python3 --no-ext-rename (Closes: #1150278)
+ * Enable parallel building again.
+ * Architecture: any, and remove workarounds for 32-bit architectures
+ that are no longer supported by python3-pot
+
+ -- Adrian Bunk <[email protected]> Wed, 21 Oct 2026 22:40:44 +0300
+
gudhi (3.13.0+dfsg-1) unstable; urgency=medium
* New upstream version.
diff -Nru gudhi-3.13.0+dfsg/debian/control gudhi-3.13.0+dfsg/debian/control
--- gudhi-3.13.0+dfsg/debian/control 2026-10-02 13:33:24.000000000 +0300
+++ gudhi-3.13.0+dfsg/debian/control 2026-10-21 22:40:44.000000000 +0300
@@ -94,7 +94,7 @@
Package: python3-gudhi
Section: python
-Architecture: amd64 arm64 i386 ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64 x32
+Architecture: any
Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
Recommends: python3-eagerpy,
python3-matplotlib,
@@ -114,7 +114,7 @@
Package: gudhi-utils
Section: math
-Architecture: amd64 arm64 i386 ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64 x32
+Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Built-Using: ${dh-builtusing:libcgal-dev},
${dh-builtusing:libeigen3-dev}
diff -Nru gudhi-3.13.0+dfsg/debian/rules gudhi-3.13.0+dfsg/debian/rules
--- gudhi-3.13.0+dfsg/debian/rules 2026-10-02 13:06:57.000000000 +0300
+++ gudhi-3.13.0+dfsg/debian/rules 2026-10-21 22:40:44.000000000 +0300
@@ -9,29 +9,8 @@
export PYBUILD_name = gudhi
-# To fix #945226, we turn off parallel builds everywhere, except if
-# someone explicitly wants them enabled by setting the environment
-# variable ALLOW_PARALLEL.
-ifeq (, $(ALLOW_PARALLEL))
- DHFLAGS+=--no-parallel
-endif
-
-# The buildds run out of memory on some architectures. On those, we
-# tune the GCC garbage collector and force non-parallel building.
-ifneq (, $(filter $(shell dpkg-architecture --query DEB_BUILD_ARCH),armhf arm64 i386 mips mipsel m68k powerpcspe x32))
- export DEB_CXXFLAGS_MAINT_APPEND = --param ggc-min-expand=5
-# We have disabled parallel builds in general now. Consider disabling
-# for certain architectures if it's reenabled globally.
-# DHFLAGS+=--no-parallel
-endif
-
-# Disable tests on i386 due to rounding problem in some. See upstream GitHub issue #118.
-ifneq (, $(filter $(shell dpkg-architecture --query DEB_BUILD_ARCH),i386 x32))
- export DEB_BUILD_MAINT_OPTIONS := $(DEB_BUILD_MAINT_OPTIONS) nocheck
-endif
-
%:
- dh $@ $(DHFLAGS) --with=python3,numpy3
+ dh $@ --with=python3,numpy3
execute_before_dh_auto_configure:
dh_auto_configure --buildsystem=cmake $(DHFLAGS) --builddirectory=build -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=false -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true -DWITH_GUDHI_GUDHUI=false -DWITH_GUDHI_REMOTE_TEST=false -DUSER_VERSION_DIR=userversion -DHERA_INCLUDE_DIR=/usr/include
@@ -120,7 +99,7 @@
dh_missing --list-missing
override_dh_python3:
- dh_python3 -O--sourcedir=build-python/userversion
+ dh_python3 -O--sourcedir=build-python/userversion --no-ext-rename
execute_before_dh_auto_clean:
rm -rf build
