[Git][debian-gis-team/pysolid][master] 3 commits: New 0002-No-display.patch

[Antonio Valentino (@antonio.valentino)]

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


Commits:
f619bc87 by Antonio Valentino at 2024-07-02T18:36:24+00:00
New 0002-No-display.patch

- - - - -
ec9fee00 by Antonio Valentino at 2024-07-02T18:36:30+00:00
Allow reprotest to fail

- - - - -
2a79a839 by Antonio Valentino at 2024-07-02T18:36:30+00:00
Tempararily suppress file-references-package-build-path

- - - - -


6 changed files:

- debian/.gitlab-ci.yml
- debian/changelog
- + debian/patches/0002-No-display.patch
- debian/patches/series
- debian/python3-pysolid.lintian-overrides
- debian/rules


Changes:

=====================================
debian/.gitlab-ci.yml
=====================================
@@ -6,3 +6,6 @@ variables:
   SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1
   SALSA_CI_DISABLE_CROSSBUILD_ARM64: 1
   SALSA_CI_REPROTEST_ENABLE_DIFFOSCOPE: 1
+
+reprotest:
+  allow_failure: true


=====================================
debian/changelog
=====================================
@@ -8,6 +8,7 @@ pysolid (0.3.3-1) unstable; urgency=medium
   * Update lintian overrides.
   * debian/patches:
     - New 0001-Fix-build-flags.patch.
+    - New 0002-No-display.patch.
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 30 Jun 2024 08:26:08 +0000
 


=====================================
debian/patches/0002-No-display.patch
=====================================
@@ -0,0 +1,66 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Tue, 2 Jul 2024 18:08:20 +0000
+Subject: No display
+
+Do not call tho the "display" program during tests.
+
+Forwarded: not-needed
+---
+ tests/grid.py  | 19 ++++++++++---------
+ tests/point.py | 19 ++++++++++---------
+ 2 files changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/tests/grid.py b/tests/grid.py
+index 35e92c9..05bef35 100755
+--- a/tests/grid.py
++++ b/tests/grid.py
+@@ -75,12 +75,13 @@ if __name__ == '__main__':
+         out_fig=out_fig,
+         display=False)
+ 
+-    # open the plotted figures
+-    if sys.platform in ['linux']:
+-        os.system(f'display {out_fig}')
+-    elif sys.platform in ['darwin']:
+-        os.system(f'open {out_fig}')
+-    elif sys.platform.startswith('win'):
+-        os.system(out_fig)
+-    else:
+-        print(f'Unknown OS system ({sys.platform}). Check results in file: {out_fig}.')
++    if os.environ.get("PYSOLID_TEST_DISPLAY", "TRUE") != "FALSE":
++        # open the plotted figures
++        if sys.platform in ['linux']:
++             os.system(f'display {out_fig}')
++        elif sys.platform in ['darwin']:
++             os.system(f'open {out_fig}')
++        elif sys.platform.startswith('win'):
++             os.system(out_fig)
++        else:
++            print(f'Unknown OS system ({sys.platform}). Check results in file: {out_fig}.')
+diff --git a/tests/point.py b/tests/point.py
+index d17686d..a172b6c 100755
+--- a/tests/point.py
++++ b/tests/point.py
+@@ -75,12 +75,13 @@ if __name__ == '__main__':
+         out_fig=out_fig,
+         display=False)
+ 
+-    # open the saved figure
+-    if sys.platform in ['linux']:
+-        os.system(f'display {out_fig}')
+-    elif sys.platform in ['darwin']:
+-        os.system(f'open {out_fig}')
+-    elif sys.platform.startswith('win'):
+-        os.system(out_fig)
+-    else:
+-        print(f'Unknown OS system ({sys.platform}). Check results in file: {out_fig}.')
++    if os.environ.get("PYSOLID_TEST_DISPLAY", "TRUE") != "FALSE":
++        # open the saved figure
++        if sys.platform in ['linux']:
++            os.system(f'display {out_fig}')
++        elif sys.platform in ['darwin']:
++            os.system(f'open {out_fig}')
++        elif sys.platform.startswith('win'):
++            os.system(out_fig)
++        else:
++            print(f'Unknown OS system ({sys.platform}). Check results in file: {out_fig}.')


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-Fix-build-flags.patch
+0002-No-display.patch


=====================================
debian/python3-pysolid.lintian-overrides
=====================================
@@ -1,2 +1,5 @@
 # False positive, lat/lon
 spelling-error-in-binary lon long *
+
+# Temporarily suppressed: apparently not actionable 
+file-references-package-build-path [usr/lib/python3/dist-packages/pysolid/solid.cpython-3*.so]


=====================================
debian/rules
=====================================
@@ -8,8 +8,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all buildinfo=+path
 export PYBUILD_NAME=pysolid
 export PYBUILD_TEST_CUSTOM=1
 export PYBUILD_TEST_ARGS=\
- env PYTHONPATH={build_dir} xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' python{version} $(CURDIR)/tests/grid.py &&\
- env PYTHONPATH={build_dir} xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' python{version} $(CURDIR)/tests/point.py
+ env PYTHONPATH={build_dir} PYSOLID_TEST_DISPLAY=FALSE xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' \
+   python{version} $(CURDIR)/tests/grid.py &&\
+ env PYTHONPATH={build_dir} PYSOLID_TEST_DISPLAY=FALSE xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' \
+   python{version} $(CURDIR)/tests/point.py
 
 %:
 	dh $@ --buildsystem=pybuild



View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/compare/81bfe2adf4f94a4687401685e5b3a0949971c306...2a79a83904a93f239c8c26e2b3a231c9c9e2abcc

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/compare/81bfe2adf4f94a4687401685e5b3a0949971c306...2a79a83904a93f239c8c26e2b3a231c9c9e2abcc
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/20240702/3d4b62ba/attachment-0001.htm>