[Git][debian-gis-team/pysolid][master] Don't override dh_auto_test for custom pybuild system.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / pysolid


Commits:
a54fe0c0 by Bas Couwenberg at 2023-07-16T14:15:29+02:00
Don't override dh_auto_test for custom pybuild system.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+pysolid (0.3.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Don't override dh_auto_test for custom pybuild system.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 16 Jul 2023 14:14:43 +0200
+
 pysolid (0.3.0-1) unstable; urgency=medium
 
   [ Bas Couwenberg ]


=====================================
debian/rules
=====================================
@@ -3,6 +3,10 @@
 export MPLBACKEND=Agg
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export PYBUILD_NAME=pysolid
+export PYBUILD_TEST_CUSTOM=1
+export PYBUILD_TEST_ARGS=cd {build_dir} &&\
+ env PYTHONPATH=. xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' python{version} $(CURDIR)/tests/grid.py &&\
+ env PYTHONPATH=. xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' python{version} $(CURDIR)/tests/point.py
 
 %:
 	dh $@ --with python3,numpy3 --buildsystem=pybuild
@@ -10,17 +14,3 @@ export PYBUILD_NAME=pysolid
 override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) -r src/*.egg-info
-
-override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	PYBUILD_SYSTEM=custom \
-        PYBUILD_TEST_ARGS="\
-	cd {build_dir} && \
-	env PYTHONPATH=. \
-	xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' \
-	python{version} $(CURDIR)/tests/grid.py && \
-	env PYTHONPATH=. \
-	xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' \
-	python{version} $(CURDIR)/tests/point.py" \
-	dh_auto_test
-endif



View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/commit/a54fe0c0824b0a9ae486039adb7bba04a3b413f6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/commit/a54fe0c0824b0a9ae486039adb7bba04a3b413f6
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/pkg-grass-devel/attachments/20230716/d072749f/attachment-0001.htm>