[med-svn] [Git][med-team/heudiconv][master] 5 commits: absolute-imports.patch: new: allow relocating tests.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Wed Jun 10 22:27:07 BST 2026
Étienne Mollier pushed to branch master at Debian Med / heudiconv
Commits:
18f13ca9 by Étienne Mollier at 2026-06-10T23:21:57+02:00
absolute-imports.patch: new: allow relocating tests.
- - - - -
5c1f9c0a by Étienne Mollier at 2026-06-10T23:23:08+02:00
d/rules: rearrange pybuild test execution.
This change serves the purpose of self containing test execution for
autopkgtest and also fixes problems of stability with the nocheck
profile.
Closes: #1137487
- - - - -
70eedff1 by Étienne Mollier at 2026-06-10T23:24:51+02:00
d/control: activate autopkgtest-pkg-pybuild.
- - - - -
3592f370 by Étienne Mollier at 2026-06-10T23:25:20+02:00
d/patches/*: minor fixups.
This change identifies patches that do not need forward upstream and
fixes a typo of the "allow to" category.
- - - - -
0f780d61 by Étienne Mollier at 2026-06-10T23:26:32+02:00
d/changelog: ready for upload to unstable.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- + debian/patches/absolute-imports.patch
- debian/patches/deb-no-demand-on-etelemetry
- debian/patches/no_versioningit.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+heudiconv (1.4.0-2) unstable; urgency=medium
+
+ * Team upload.
+ * absolute-imports.patch: new: allow relocating tests.
+ * d/rules: rearrange pybuild test execution.
+ This change serves the purpose of self containing test execution for
+ autopkgtest and also fixes problems of stability with the nocheck
+ profile. (Closes: #1137487)
+ * d/control: activate autopkgtest-pkg-pybuild.
+ * d/patches/*: minor fixups.
+ This change identifies patches that do not need forward upstream and
+ fixes a typo of the "allow to" category.
+
+ -- Étienne Mollier <emollier at debian.org> Wed, 10 Jun 2026 23:26:13 +0200
+
heudiconv (1.4.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,5 +1,5 @@
Source: heudiconv
-#Testsuite: autopkgtest-pkg-pybuild
+Testsuite: autopkgtest-pkg-pybuild
Standards-Version: 4.7.4
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders:
=====================================
debian/patches/absolute-imports.patch
=====================================
@@ -0,0 +1,35 @@
+Description: adjust tests to do absolute imports of heudiconv.
+ This allows running tests in a directory indpendent of the location of
+ heudiconv scripting. This facilitates autopkgtest integration in
+ Debian context.
+Author: Étienne Mollier <emollier at debian.org>
+Forwarded: not-needed
+Last-Update: 2026-06-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- heudiconv.orig/heudiconv/tests/test_archives.py
++++ heudiconv/heudiconv/tests/test_archives.py
+@@ -10,7 +10,7 @@
+ import pytest
+
+ from .utils import TESTS_DATA_PATH
+-from ..parser import get_extracted_dicoms
++from heudiconv.parser import get_extracted_dicoms
+
+
+ def _get_dicoms_archive(tmpdir: Path, fmt: str) -> list[str]:
+--- heudiconv.orig/heudiconv/tests/test_heuristics.py
++++ heudiconv/heudiconv/tests/test_heuristics.py
+@@ -17,9 +17,9 @@
+ from heudiconv.cli.run import main as runner
+
+ from .utils import TESTS_DATA_PATH
+-from .. import __version__
+-from ..bids import HEUDICONV_VERSION_JSON_KEY
+-from ..utils import load_json
++from heudiconv import __version__
++from heudiconv.bids import HEUDICONV_VERSION_JSON_KEY
++from heudiconv.utils import load_json
+
+ lgr = logging.getLogger(__name__)
+
=====================================
debian/patches/deb-no-demand-on-etelemetry
=====================================
@@ -2,9 +2,10 @@ From: Yaroslav Halchenko <debian at onerussian.com>
Subject: do not strictly depend on etelemetry
It will be at most a recommended dependency anyways.
- Code should allow to run without it
+ Code should be able to run without it
Last-Update: 2019-12-05
+Forwarded: not-needed
--- a/heudiconv/info.py
+++ b/heudiconv/info.py
=====================================
debian/patches/no_versioningit.patch
=====================================
@@ -1,6 +1,7 @@
Author: Andreas Tille <tille at debian.org>
Last-Update: 2026-05-08
Description: Avoid versioningit
+Forwarded: not-needed
--- a/pyproject.toml
+++ b/pyproject.toml
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
deb-no-demand-on-etelemetry
no_versioningit.patch
+absolute-imports.patch
=====================================
debian/rules
=====================================
@@ -10,11 +10,16 @@ export http_proxy=http://127.0.0.1:9/
export EMAIL=debian at example.com
export GIT_AUTHOR_NAME="The Name"
export GIT_COMMITTER_NAME=$(GIT_AUTHOR_NAME)
-export PYBUILD_BEFORE_TEST := cp -a heudiconv/tests {build_dir}/heudiconv/
# zeros.bval does not exists (in the tarbal at least...)
-export PYBUILD_TEST_ARGS=heudiconv/tests/test_* -k 'not test_bvals_are_zero and not test_reproin_largely_smoke'
# test_reproin_largely_smoke likely only fails on 32 bit platform
+export PYBUILD_BEFORE_TEST = \
+ rm -rf {build_dir}/heudiconv/tests \
+ ; cp -a heudiconv/tests {build_dir}/
+export PYBUILD_TEST_ARGS = \
+ -k 'not test_bvals_are_zero and not test_reproin_largely_smoke'
+export PYBUILD_AFTER_TEST = \
+ rm -r {build_dir}/tests
%:
dh $@ --buildsystem=pybuild
@@ -35,10 +40,3 @@ execute_after_dh_clean:
# Ahhhhhhh!
rm -rf .pybuild build .pytest_cache/
-rm -rf heudiconv.egg-info/
-
-execute_after_dh_python3:
- # No idea why the test is not moved
- mv debian/heudiconv/usr/lib/python3.*/dist-packages/heudiconv/tests debian/heudiconv/usr/lib/python3/dist-packages/heudiconv/tests
- rmdir debian/heudiconv/usr/lib/python3.*/dist-packages/heudiconv
- rmdir debian/heudiconv/usr/lib/python3.*/dist-packages
- rmdir debian/heudiconv/usr/lib/python3.*
View it on GitLab: https://salsa.debian.org/med-team/heudiconv/-/compare/16cd7dd8aea861ed5c5274045943fb88a95acc3e...0f780d6122d9bdc5820a2ce35115735f6b834906
--
View it on GitLab: https://salsa.debian.org/med-team/heudiconv/-/compare/16cd7dd8aea861ed5c5274045943fb88a95acc3e...0f780d6122d9bdc5820a2ce35115735f6b834906
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260610/419dcaaf/attachment-0001.htm>
More information about the debian-med-commit
mailing list