[Git][debian-gis-team/pysolid][master] 6 commits: Add missing Source URL in d/copyright

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch master at Debian GIS Project / pysolid


Commits:
b4494b71 by Antonio Valentino at 2022-05-15T18:11:26+00:00
Add missing Source URL in d/copyright

- - - - -
31f657c7 by Antonio Valentino at 2022-05-15T18:12:40+00:00
Use py3versions instead of py2versions in d/rules

- - - - -
00d9b642 by Antonio Valentino at 2022-05-15T18:15:15+00:00
Clean and reformat d/rules

- - - - -
86dfb62a by Antonio Valentino at 2022-05-15T18:16:14+00:00
Remove repacksuffix from d/watch

- - - - -
2150291d by Antonio Valentino at 2022-05-15T19:32:40+00:00
Add missing build dependencies

- - - - -
e200e2ff by Antonio Valentino at 2022-05-15T20:42:12+00:00
Improve override_dh_auto_test rule.

- - - - -


4 changed files:

- debian/control
- debian/copyright
- debian/rules
- debian/watch


Changes:

=====================================
debian/control
=====================================
@@ -14,7 +14,9 @@ Build-Depends: gfortran,
                python3-pytest,
                python3-scipy,
                python3-skimage,
-               python3-setuptools
+               python3-setuptools,
+               xauth,
+               xvfb
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/pysolid
 Vcs-Git: https://salsa.debian.org/debian-gis-team/pysolid.git


=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pysolid
 Upstream-Contact: Zhang Yunjun <yunjunzgeo at gmail.com>
-Source: 
+Source: https://github.com/insarlab/PySolid
 
 Files: *
 Copyright: 2020 the California Institute of Technology


=====================================
debian/rules
=====================================
@@ -1,10 +1,9 @@
 #! /usr/bin/make -f
 
+export MPLBACKEND=Agg
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export PYBUILD_NAME=pysolid
 
-PY2VERS = $(shell pyversions -r -v)
-
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
@@ -12,19 +11,20 @@ override_dh_python3:
 	dh_python3
 	dh_numpy3
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-endif
+override_dh_auto_clean:
+	dh_auto_clean
+	$(RM) -r src/*.egg-info
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e -x; \
-	for py in $(PY2VERS); do \
-		xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" python$$py $(CURDIR)/tests/test_SET_grid.py  ; \
-		xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" python$$py $(CURDIR)/tests/test_SET_point.py ; \
-	done
+	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/test_SET_grid.py && \
+	env PYTHONPATH=. \
+	xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' \
+	python{version} $(CURDIR)/tests/test_SET_point.py" \
+	dh_auto_test
 endif
-
-override_dh_auto_clean:
-	dh_auto_clean
-	$(RM) -r src/*.egg-info


=====================================
debian/watch
=====================================
@@ -2,7 +2,6 @@ version=4
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|c|beta|b|alpha|a)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g,\
-filenamemangle=s/(?:.*?)?(?:rel|v|pysolid)?[\-\_]?(\d\S*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/pysolid-$1.$2/,\
-repacksuffix=+dfsg \
+filenamemangle=s/(?:.*?)?(?:rel|v|pysolid)?[\-\_]?(\d\S*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/pysolid-$1.$2/ \
 https://github.com/insarlab/pysolid/tags \
 (?:.*?/archive/(?:.*?/)?)?(?:rel|v|pysolid)?[\-\_]?(\d\S*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))



View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/compare/4e8345029f7aafb3ad439430f470b5d7c6db78e2...e200e2fff8985cde152374c7014bcfbe501172f9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/compare/4e8345029f7aafb3ad439430f470b5d7c6db78e2...e200e2fff8985cde152374c7014bcfbe501172f9
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/20220515/b1369230/attachment-0001.htm>