Étienne Mollier pushed to branch master at Debian Med / nibabel
Commits: 9653a75b by Étienne Mollier at 2024-05-25T17:47:32+02:00 drop_deprecated_nisext_for_python3.12_compatibility.patch: unfuzz. - - - - - 83911d93 by Étienne Mollier at 2024-05-25T18:18:21+02:00 pytest-8.patch: new: rename setup and teardown functions. Closes: #1071461 - - - - - 226cf0f3 by Étienne Mollier at 2024-05-25T18:18:38+02:00 d/control: declare compliance to standards version 4.7.0. - - - - - 1c17fafd by Étienne Mollier at 2024-05-25T18:19:18+02:00 Ready to upload to unstable. - - - - - 78d86994 by Étienne Mollier at 2024-05-28T22:08:28+02:00 Fix broken setup/teardown that occured only on autopkgtest. Gbp-Dch: ignore - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/drop_deprecated_nisext_for_python3.12_compatibility.patch - + debian/patches/pytest-8.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +nibabel (5.2.1-2) unstable; urgency=medium + + * drop_deprecated_nisext_for_python3.12_compatibility.patch: unfuzz. + * pytest-8.patch: new: rename setup and teardown functions. + Closes: #1071461 + * d/control: declare compliance to standards version 4.7.0. + + -- Étienne Mollier <[email protected]> Sat, 25 May 2024 18:18:56 +0200 + nibabel (5.2.1-1) unstable; urgency=medium * New upstream version ===================================== debian/control ===================================== @@ -23,7 +23,7 @@ Build-Depends: debhelper-compat (= 13), python3-numpydoc, python3-pytest <!nocheck>, python3-pytest-httpserver <!nocheck> -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/med-team/nibabel Vcs-Git: https://salsa.debian.org/med-team/nibabel.git Homepage: https://nipy.org/nibabel/ ===================================== debian/patches/drop_deprecated_nisext_for_python3.12_compatibility.patch ===================================== @@ -5,8 +5,8 @@ Bug-Debian: https://bugs.debian.org/1063588 Author: Andreas Tille <[email protected]> Last-Update: Mon, 12 Feb 2024 10:44:49 +0100 ---- a/.coveragerc -+++ b/.coveragerc +--- nibabel.orig/.coveragerc ++++ nibabel/.coveragerc @@ -1,7 +1,7 @@ [run] branch = True @@ -17,9 +17,9 @@ Last-Update: Mon, 12 Feb 2024 10:44:49 +0100 omit = */externals/* */benchmarks/* ---- a/Makefile -+++ b/Makefile -@@ -260,7 +260,7 @@ sdist-venv: clean +--- nibabel.orig/Makefile ++++ nibabel/Makefile +@@ -260,7 +260,7 @@ mkdir venv/tmp cd venv/tmp && unzip ../../dist/*.zip . venv/bin/activate && cd venv/tmp/nibabel* && python setup.py install @@ -28,9 +28,9 @@ Last-Update: Mon, 12 Feb 2024 10:44:49 +0100 source-release: distclean $(PYTHON) -m compileall . ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -86,7 +86,7 @@ exclude = [ +--- nibabel.orig/pyproject.toml ++++ nibabel/pyproject.toml +@@ -87,7 +87,7 @@ ] [tool.hatch.build.targets.wheel] ===================================== debian/patches/pytest-8.patch ===================================== @@ -0,0 +1,36 @@ +Description: port pytest setup and teardown calls to pytest-8. + +Author: Étienne Mollier <[email protected]> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071461 +Forwarded: no +Last-Update: 2024-05-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- nibabel.orig/nibabel/streamlines/tests/test_streamlines.py ++++ nibabel/nibabel/streamlines/tests/test_streamlines.py +@@ -21,7 +21,7 @@ + DATA = {} + + +-def setup(): ++def setup_function(): + global DATA + DATA['empty_filenames'] = [pjoin(data_path, 'empty' + ext) for ext in FORMATS.keys()] + DATA['simple_filenames'] = [pjoin(data_path, 'simple' + ext) for ext in FORMATS.keys()] +--- nibabel.orig/nibabel/tests/test_deprecated.py ++++ nibabel/nibabel/tests/test_deprecated.py +@@ -15,12 +15,12 @@ + from nibabel.tests.test_deprecator import TestDeprecatorFunc as _TestDF + + +-def setup(): ++def setup_module(): + # Hack nibabel version string + pkg_info.cmp_pkg_version.__defaults__ = ('2.0',) + + +-def teardown(): ++def teardown_module(): + # Hack nibabel version string back again + pkg_info.cmp_pkg_version.__defaults__ = (pkg_info.__version__,) + ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ python3.10.patch skip-test-removalschedule.patch skip-armel-test-nan2zero.patch drop_deprecated_nisext_for_python3.12_compatibility.patch +pytest-8.patch View it on GitLab: https://salsa.debian.org/med-team/nibabel/-/compare/0b388fa2754c2f5c778cfc3392a36c483caf4549...78d869948f6c1a8083e01cec135f498a10b839ec -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/med-team/nibabel/-/compare/0b388fa2754c2f5c778cfc3392a36c483caf4549...78d869948f6c1a8083e01cec135f498a10b839ec You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
