Hi all, I brought some changes in dipy/1.3.0-3[1] to address RC bugs #987453[2] and #987517[3], and I am preparing an unblock request for the release team, debdiff in attachment. Salsa CI raises no complaints, but disclaimer, the build time test suite result is currently ignored. Please consider review and sponsored upload or DM grants. [1]: https://salsa.debian.org/med-team/dipy [2]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987453 [3]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987517 Have a nice day, :) -- Étienne Mollier <etienne.mollier@mailoo.org> Fingerprint: 8f91 b227 c7d6 f2b1 948c 8236 793c f67e 8f0d 11da Sent from /dev/pts/2, please excuse my verbosity.
diff -Nru dipy-1.3.0/debian/changelog dipy-1.3.0/debian/changelog
--- dipy-1.3.0/debian/changelog 2021-01-20 11:52:53.000000000 +0100
+++ dipy-1.3.0/debian/changelog 2021-04-25 11:15:12.000000000 +0200
@@ -1,3 +1,14 @@
+dipy (1.3.0-3) unstable; urgency=medium
+
+ * Team upload.
+ * d/rules: prevent build time test suite from accessing network resources.
+ Closes: #987517
+ * d/rules: install .so files in python3-dipy-lib; this makes several dipy
+ modules, formerly missing, now usable.
+ Closes: #987453
+
+ -- Étienne Mollier <etienne.mollier@mailoo.org> Sun, 25 Apr 2021 11:15:12 +0200
+
dipy (1.3.0-2) unstable; urgency=medium
* Team upload.
diff -Nru dipy-1.3.0/debian/rules dipy-1.3.0/debian/rules
--- dipy-1.3.0/debian/rules 2021-01-20 11:52:53.000000000 +0100
+++ dipy-1.3.0/debian/rules 2021-04-25 10:47:24.000000000 +0200
@@ -57,6 +57,8 @@
# cd build to prevent use of local/not-built source tree
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
set -x ; \
+ export http_proxy=http://127.0.0.1:9/ ; \
+ export https_proxy=https://127.0.0.1:9/ ; \
for PYTHON in $(PY3VERS); do \
export PYTHONPATH=$$(pybuild --print build_dir --interpreter python$$PYTHON); \
echo "I: Running Dipy unittests using $$PYTHON"; \
@@ -69,12 +71,17 @@
done
endif
-## remove .so libraries from main package, and call dh_numpy*
+## move .so libraries into -lib package, and call dh_numpy*
## while removing 2 if not present
_dh_python%:
- if [ -d debian/$(PACKAGE$*_NAME)/usr/lib ]; then \
- find debian/$(PACKAGE$*_NAME)/usr/lib -name "*.so" -delete; \
- fi
+ set -e \
+ ; test -d debian/$(PACKAGE$*_NAME)/usr/lib || exit 0 \
+ ; for lib in $$(find debian/$(PACKAGE$*_NAME)/usr/lib -name "*.so") \
+ ; do sdir=$$(dirname $$lib) \
+ ; tdir=debian/$(PACKAGE$*_NAME)-lib/$${sdir#*$(PACKAGE$*_NAME)/} \
+ ; mkdir -p "$${tdir}" \
+ ; mv -v "$${lib}" "$${tdir}" \
+ ; done
[ -e /usr/bin/dh_numpy$(*:2=) ] && dh_numpy$(*:2=) -p$(PACKAGE$*_NAME)-lib || :
dh_python$*
Attachment:
signature.asc
Description: PGP signature