[med-svn] [Git][med-team/nitime][master] 2 commits: d/rules: move cleaning logic to d/clean

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / nitime


Commits:
f13eef38 by Michael R. Crusoe at 2024-09-23T09:46:00+02:00
d/rules: move cleaning logic to d/clean

- - - - -
3bc097d0 by Michael R. Crusoe at 2024-09-23T09:51:30+02:00
Switch autopkgtest to pybuild-autopkgtest. Skip some tests on 32-bit systems.

- - - - -


7 changed files:

- debian/changelog
- + debian/clean
- debian/control
- debian/rules
- − debian/tests/README.md
- − debian/tests/control
- − debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+nitime (0.11-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * d/rules: move cleaning logic to d/clean
+  * Switch autopkgtest to pybuild-autopkgtest. Skip some tests on 32-bit
+    systems.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Mon, 23 Sep 2024 09:34:27 +0200
+
 nitime (0.11-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -0,0 +1,7 @@
+build/
+doc/_build/
+doc/examples/fig/
+doc/api/generated/
+doc/examples/*rst
+nitime/_utils.c
+nitime/_version.py


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Yaroslav Halchenko <debian at onerussian.com>,
            Nilesh Patra <nilesh at debian.org>,
            Étienne Mollier <emollier at debian.org>
 Section: python
-Testsuite: autopkgtest-pkg-python
+Testsuite: autopkgtest-pkg-pybuild
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                python3-all,


=====================================
debian/rules
=====================================
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/default.mk
 PACKAGE_NAME = python3-nitime
 PACKAGE_ROOT_DIR = debian/${PACKAGE_NAME}
 INSTALL_PATH = $(CURDIR)/debian/tmp
@@ -12,12 +13,17 @@ PYTHON=$(shell py3versions -d)
 export MPLCONFIGDIR=$(CURDIR)/build
 export HOME=$(CURDIR)/build
 
+ifneq (,$(findstring $(DEB_HOST_ARCH_BITS),32))
+export PYBUILD_TEST_ARGS=-k "not (test_UniformTime_index_at or test_basic_slicing or test_index_at_20101206 or test_timearray_math_functions)" --pyargs nitime
+else
+export PYBUILD_TEST_ARGS=--pyargs nitime
+endif
+# skip some test on 32-bit systems.
+
 %:
 	dh $@ --buildsystem pybuild
 
-override_dh_auto_install:
-	dh_auto_install
-
+execute_after_dh_auto_install:
 	mkdir -p $(MPLCONFIGDIR)  # just in case
 	: # Prune duplicate LICENSE file
 	find debian/ -name LICENSE -delete
@@ -29,8 +35,6 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	-rm doc/_build/html/_static/jquery.js
 	-rm doc/_build/html/_static/underscore.js
 	-rm -r doc/_build/html/_sources
-	: # objects inventory is of no use for the package
-	-rm doc/_build/html/objects.inv
 	for f in `find . -name "*.html"`; do \
 		sed -i -e '/cloudflare/d' -e '/jsdelivr/d' $$f; \
 	done
@@ -41,17 +45,5 @@ endif
 override_dh_compress:
 	dh_compress -X.py -X.html -X.css -X.jpg -X.txt -X.js -X.json -X.rtc -X.par -X.bin
 
-override_dh_clean:
-	dh_clean
-	@echo "I: Removing other generated material"
-	rm -rf \
-	    build \
-	    doc/_build \
-	    doc/examples/fig \
-	    doc/api/generated/ \
-	    doc/examples/*rst \
-	    nitime/_utils.c \
-	    nitime/_version.py
-
 get-orig-source:
 	-uscan --upstream-version 0 --rename


=====================================
debian/tests/README.md deleted
=====================================
@@ -1,13 +0,0 @@
-## To run the test:
-
-`sh run-unit-test`
-
-The package needs be built from scratch to run the upstream test.
-
-Upstream test can be run with:
-
-`$py -m pytest`
-
-However, this will popup two GUIS which needs to be closed before tests run.
-
-The path to each test folder was specified to circumvent the GUI popup.
\ No newline at end of file


=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-Tests: run-unit-test
-Depends: python3-nitime, python3-pytest, python3-all
-Restrictions: allow-stderr


=====================================
debian/tests/run-unit-test deleted
=====================================
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-CUR_DIR=`pwd`
-
-if [ "$AUTOPKGTEST_TMP" = "" ]; then
-	AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXX`
-
-	trap "rm -rf $AUTOPKG_TMP" 0 INT QUIT ABRT PIPE TERM
-
-fi
-
-cd $AUTOPKGTEST_TMP
-
-
-# Copy Upstream tests
-cp -a ${CUR_DIR}/nitime/algorithms/tests/ $AUTOPKGTEST_TMP
-cp -a ${CUR_DIR}/nitime/analysis/ $AUTOPKGTEST_TMP
-cp -a ${CUR_DIR}/nitime/fmri/ $AUTOPKGTEST_TMP
-cp -a ${CUR_DIR}/nitime/tests/ $AUTOPKGTEST_TMP
-
-
-for py in $(py3versions -s 2> /dev/null)
-
-do
-
-    # Run upstream tests
-    $py -m pytest 
-   
-
-done
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/med-team/nitime/-/compare/9dd9d432aa402229a437e1b45debe503e5e94010...3bc097d037a47f610d4abc49823fbad2f54402fb

-- 
View it on GitLab: https://salsa.debian.org/med-team/nitime/-/compare/9dd9d432aa402229a437e1b45debe503e5e94010...3bc097d037a47f610d4abc49823fbad2f54402fb
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/20240923/6f1e87dc/attachment-0001.htm>