[med-svn] [Git][med-team/nipy][master] 6 commits: d/rules: adjust pybuild invocation for the documentation.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Mon Mar 2 21:56:55 GMT 2026
Étienne Mollier pushed to branch master at Debian Med / nipy
Commits:
b7e23f63 by Étienne Mollier at 2026-03-02T22:38:22+01:00
d/rules: adjust pybuild invocation for the documentation.
It seems now necessary to pass the --pyver argument to be able to use
the pybuild command properly, taken out of context.
Closes: #1126219
- - - - -
4f6db27e by Étienne Mollier at 2026-03-02T22:46:41+01:00
d/rules: attempt at improving the readability of recipes.
- - - - -
c7a11a30 by Étienne Mollier at 2026-03-02T22:47:17+01:00
d/clean: trim blank line.
- - - - -
cc86d1d7 by Étienne Mollier at 2026-03-02T22:47:31+01:00
d/control: drop redundant Priority: optional.
- - - - -
a58e6087 by Étienne Mollier at 2026-03-02T22:47:53+01:00
d/control: declare compliance to standards version 4.7.3.
- - - - -
a2760f0d by Étienne Mollier at 2026-03-02T22:49:04+01:00
d/changelog: ready for upload to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/clean
- debian/control
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+nipy (0.6.1-4) unstable; urgency=medium
+
+ * d/rules: adjust pybuild invocation for the documentation.
+ It seems now necessary to pass the --pyver argument to be able to use
+ the pybuild command properly, taken out of context. (Closes: #1126219)
+ * d/rules: attempt at improving the readability of recipes.
+ * d/clean: trim blank line.
+ * d/control: drop redundant Priority: optional.
+ * d/control: declare compliance to standards version 4.7.3.
+
+ -- Étienne Mollier <emollier at debian.org> Mon, 02 Mar 2026 22:48:54 +0100
+
nipy (0.6.1-3) unstable; urgency=medium
* bool-type-error.patch: new: fix test failures. (Closes: #1117755)
=====================================
debian/clean
=====================================
@@ -2,4 +2,3 @@ _configtest.o.d
_configtest.c
_configtest.o
_configtest
-
=====================================
debian/control
=====================================
@@ -3,7 +3,6 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Étienne Mollier <emollier at debian.org>
Section: python
Testsuite: autopkgtest-pkg-pybuild
-Priority: optional
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
pybuild-plugin-pyproject,
@@ -28,7 +27,7 @@ Build-Depends: debhelper-compat (= 13),
dvipng,
help2man,
python3-numpy-dev
-Standards-Version: 4.7.2
+Standards-Version: 4.7.3
Vcs-Browser: https://salsa.debian.org/med-team/nipy
Vcs-Git: https://salsa.debian.org/med-team/nipy.git
Homepage: https://nipy.org/nipy/
=====================================
debian/rules
=====================================
@@ -1,41 +1,50 @@
#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-
export DH_VERBOSE=1
-
include /usr/share/dpkg/default.mk
-
-PYVER = $(shell py3versions -vd)
export PYBUILD_NAME = nipy
+export PYBUILD_TEST_ARGS=--pyargs nipy
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export NIPY_EXTERNAL_LAPACK=1
# stop matplotlib from thinking it should display plots
export MPLBACKEND=Agg
+PYVER = $(shell py3versions -vd)
DESTDIR = $(CURDIR)/debian/python3-$(PYBUILD_NAME)
DISTDIR = $(DESTDIR)/usr/lib/python3/dist-packages
-export PYBUILD_TEST_ARGS=--pyargs nipy
-
# Mega rule
%:
dh $@ --buildsystem=pybuild --with=sphinxdoc
manpages:
@echo "I: generating manpages"
- set -e; mkdir -p $(CURDIR)/build/manpages && \
- cd $(DESTDIR)/usr/bin/ && for f in *; do \
- descr=$$(grep -h -e "^ *'''" -e 'DESCRIP =' $$f | sed -e "s,.*' *\([^'][^']*\)'.*,\1,g" | head -n 1); \
- PYTHONPATH=../ \
- help2man -n "$$descr" --no-discard-stderr --no-info --version-string "$(DEB_VERSION_UPSTREAM)" "python3 ./$$f" \
- >| ../../../../build/manpages/$$f.1; \
- done
+ set -e \
+ ; mkdir -p $(CURDIR)/build/manpages \
+ ; cd $(DESTDIR)/usr/bin/ \
+ ; for f in * \
+ ; do descr=$$( \
+ grep -h -e "^ *'''" -e 'DESCRIP =' $$f \
+ | sed -e "s,.*' *\([^'][^']*\)'.*,\1,g" \
+ | head -n 1 \
+ ) \
+ ; PYTHONPATH=../ \
+ help2man -n "$${descr}" \
+ --no-discard-stderr \
+ --no-info \
+ --version-string "$(DEB_VERSION_UPSTREAM)" \
+ "python3 ./$$f" \
+ >| ../../../../build/manpages/$$f.1 \
+ ; done
execute_after_dh_auto_build-indep:
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
# Generate documentation
- PYTHONPATH=$$(pybuild --print build_dir --interpreter python$(PYVER)) \
+ PYTHONPATH=$$( \
+ pybuild --print build_dir \
+ --interpreter python$(PYVER) \
+ --pyver $(PYVER) \
+ ) \
http_proxy='127.0.0.1:9' \
PATH=$(CURDIR)/debian/tmp/usr/bin/:$$PATH \
HOME=$(CURDIR)/build \
@@ -45,16 +54,18 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
endif
override_dh_install:
- : # I: Move libraries into the python3-nipy-lib packages
- ( cd $(DESTDIR) && \
- find . -iname *.so | \
- while read so; do \
- d=../python3-nipy-lib/$$(dirname $$so); \
- mkdir -p $$d; echo "Moving $$so under $$d"; mv $$so $$d; \
- done; \
+ @ echo 'I: Move libraries into the python3-nipy-lib packages'
+ ( cd $(DESTDIR) \
+ && find . -iname *.so \
+ | while read so \
+ ; do d=../python3-nipy-lib/$$(dirname $$so) \
+ ; mkdir -p $$d \
+ ; echo "Moving $$so under $$d" \
+ ; mv $$so $$d \
+ ; done \
)
dh_install
- : # I: Assure versioned dependency on NumPy
+ @ echo 'I: Assure versioned dependency on NumPy'
dh_numpy3
-rm debian/python-nipy-doc/usr/share/javascript/underscore/underscore.js
@@ -64,7 +75,7 @@ override_dh_python3:
## immediately usable documentation and exemplar scripts/data
override_dh_compress:
- : # I: Avoiding compression of what should not be compressed
+ @ echo 'I: Avoiding compression of what should not be compressed'
dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc -Xobjects.inv
override_dh_installman: manpages
@@ -72,7 +83,7 @@ override_dh_installman: manpages
#dh_installman -ppython3-nipy build/manpages/*.1
override_dh_clean:
- : # I: Custom cleaning
+ @ echo 'I: Custom cleaning'
rm -rf build nipy/neurospin/__config__.py
$(MAKE) -C doc clean
dh_clean
View it on GitLab: https://salsa.debian.org/med-team/nipy/-/compare/1abc7dfe7ef115df217c47f504d4ec9a44d2a9e3...a2760f0d5ccbbb1cad5563521a045fad1f0de037
--
View it on GitLab: https://salsa.debian.org/med-team/nipy/-/compare/1abc7dfe7ef115df217c47f504d4ec9a44d2a9e3...a2760f0d5ccbbb1cad5563521a045fad1f0de037
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260302/3b940839/attachment-0001.htm>
More information about the debian-med-commit
mailing list