[Git][debian-gis-team/pycoast][master] 6 commits: Use teh <!nocheck> and <!nodoc> markers in d/control
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Mon Aug 14 17:52:35 BST 2023
Antonio Valentino pushed to branch master at Debian GIS Project / pycoast
Commits:
e3061ee5 by Antonio Valentino at 2023-08-14T16:01:41+00:00
Use teh <!nocheck> and <!nodoc> markers in d/control
- - - - -
6bcbf337 by Antonio Valentino at 2023-08-14T16:04:30+00:00
Update package description
- - - - -
0b76d8c7 by Antonio Valentino at 2023-08-14T16:13:30+00:00
Switch to autopkgtest-pkg-pybuild
- - - - -
868ab244 by Antonio Valentino at 2023-08-14T16:52:03+00:00
Cleanup
- - - - -
1b4ad03b by Antonio Valentino at 2023-08-14T16:52:09+00:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
ef8ddfad by Antonio Valentino at 2023-08-14T16:52:09+00:00
New d/python3-pycoast.lintian-overrides
- - - - -
8 changed files:
- debian/changelog
- debian/clean
- debian/control
- debian/python-pycoast-doc.docs
- + debian/python3-pycoast.lintian-overrides
- debian/rules
- − debian/tests/control
- − debian/tests/python3
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,23 @@
pycoast (1.6.1+dfsg-4) UNRELEASED; urgency=medium
+ [ Bas Couwenberg ]
* Team upload.
* Remove generated files in clean target.
(closes: #1047331)
* Use execute_after instead of override in rules file.
+ [ Antonio Valentino ]
+ * debian/control:
+ - Use the <!nocheck> and <!nodoc> markers.
+ - Update package description.
+ * Switch to autopkgtest-pkg-pybuild and remove the no longer
+ needed d/test folder.
+ * debian/rules:
+ - Improve doc build.
+ - Remove unnecesssary rules.
+ * Simplify d/clean.
+ * New d/python3-pycoast.lintian-overrides.
+
-- Bas Couwenberg <sebastic at debian.org> Fri, 11 Aug 2023 15:35:48 +0200
pycoast (1.6.1+dfsg-3) unstable; urgency=medium
=====================================
debian/clean
=====================================
@@ -1,2 +1 @@
*-info/
-docs/source/api/
=====================================
debian/control
=====================================
@@ -2,7 +2,7 @@ Source: pycoast
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Antonio Valentino <antonio.valentino at tiscali.it>
Section: python
-Testsuite: autopkgtest-pkg-python
+Testsuite: autopkgtest-pkg-pybuild
Priority: optional
Build-Depends: debhelper-compat (= 13),
dh-python,
@@ -15,16 +15,22 @@ Build-Depends: debhelper-compat (= 13),
python3-pyproj,
python3-pyresample,
python3-pyshp,
- python3-pytest,
+ python3-pytest <!nocheck>,
python3-setuptools,
- python3-sphinx,
- python3-sphinxcontrib.apidoc,
- python3-sphinx-rtd-theme
+ python3-sphinx <!nodoc>,
+ python3-sphinxcontrib.apidoc <!nodoc>,
+ python3-sphinx-rtd-theme <!nodoc>
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/debian-gis-team/pycoast
Vcs-Git: https://salsa.debian.org/debian-gis-team/pycoast.git
Homepage: https://github.com/pytroll/pycoast
Rules-Requires-Root: no
+Description: Draw coastlines, borders and rivers on images (for Python 3)
+ Pycoast is a Python package to add coastlines, borders and rivers to
+ raster images using data from the GSHHG (previously known as GSHHS)
+ and WDBII datasets.
+ .
+ This package is part of the PyTroll toolset.
Package: python3-pycoast
Architecture: all
@@ -36,14 +42,8 @@ Depends: python3-aggdraw,
${misc:Depends}
Suggests: fonts-dejavu-core,
python-pycoast-doc
-Description: Draw coastlines, borders and rivers on images (for Python 3)
- Pycoast is a Python package to add coastlines, borders and rivers to
- raster images using data from the GSHHG (previously known as GSHHS)
- and WDBII datasets.
- .
- This package is part of the PyTroll toolset.
- .
- This package contains pycoast for Python 3.
+Description: ${source:Synopsis}
+ ${source:Extended-Description}
Package: python-pycoast-doc
Architecture: all
@@ -52,11 +52,7 @@ Section: doc
Depends: ${sphinxdoc:Depends},
${misc:Depends}
Suggests: www-browser
-Description: Draw coastlines, borders and rivers on images (common documentation)
- Pycoast is a Python package to add coastlines, borders and rivers to
- raster images using data from the GSHHG (previously known as GSHHS)
- and WDBII datasets.
- .
- This package is part of the PyTroll toolset.
+Description: ${source:Synopsis} (documentation)
+ ${source:Extended-Description}
.
This is the common documentation package.
=====================================
debian/python-pycoast-doc.docs
=====================================
@@ -1,2 +1 @@
-docs/build/html
-
+.pybuild/docs/html
=====================================
debian/python3-pycoast.lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# False positive
+package-contains-documentation-outside-usr-share-doc [usr/lib/python3/dist-packages/pycoast-*.*-info/*]
=====================================
debian/rules
=====================================
@@ -3,10 +3,7 @@
#export DH_VERBOSE=1
-export PYTHONPATH=$(CURDIR)
-
export PYBUILD_NAME=pycoast
-export PYBUILD_BEFORE_TEST=cp -r {dir}/pycoast/tests/* {build_dir}/pycoast/tests
export PYBUILD_AFTER_TEST=rm -rf {build_dir}/pycoast/tests {build_dir}/*.png
export PYBUILD_TEST_ARGS=\
-k "not test_add_shapefiles_from_dict_agg \
@@ -22,30 +19,20 @@ and not test_add_grid_from_dict_pil \
and not test_eastern_shapes_pil \
and not test_western_shapes_pil \
and not test_no_h_scratch_pil \
-and not test_no_v_scratch_pil" \
+and not test_no_v_scratch_pil \
+and not test_add_cities_cfg_agg \
+and not test_add_cities_from_dict_agg" \
$(CURDIR)/pycoast/tests
%:
dh $@ --with python3,numpy3,sphinxdoc --buildsystem=pybuild
-execute_after_dh_auto_clean:
- $(MAKE) -C docs clean
-
execute_after_dh_auto_build-indep:
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
- cd docs && \
- sphinx-build -N -E -T -b html . $(CURDIR)/.pybuild/docs/html/
- rm -rf $(CURDIR)/.pybuild/docs/html/.doctrees
-endif
-
-execute_after_dh_auto_build:
- env http_proxy='http://127.0.0.1:9/' https_proxy='https://127.0.0.1:9/' \
+ env PYTHONPATH={build_dir} \
+ http_proxy='http://127.0.0.1:9/' https_proxy='https://127.0.0.1:9/' \
LC_ALL=C.UTF-8 LANGUAGE=C.UTF-8 \
- $(MAKE) -C docs html
- $(RM) -r docs/build/html/_images
-
-override_dh_python3:
- dh_python3 -N python-pycoast-doc
-
-override_dh_numpy3:
- dh_numpy3 -N python-pycoast-doc
+ sphinx-build -N -E -T -b html docs/source $(CURDIR)/.pybuild/docs/html
+ $(RM) -r $(CURDIR)/.pybuild/docs/html/.doctrees
+ $(RM) -r $(CURDIR)/.pybuild/docs/html/_images
+endif
=====================================
debian/tests/control deleted
=====================================
@@ -1,2 +0,0 @@
-Tests: python3
-Depends: @builddeps@, @, python3-all
=====================================
debian/tests/python3 deleted
=====================================
@@ -1,29 +0,0 @@
-#!/bin/sh
-set -efu
-
-PYS=${PYS:-"$(py3versions -s 2>/dev/null)"}
-TESTPKG=${TESTPKG:-pycoast}
-TESTDIR=${PWD}/pycoast/tests
-cd "$AUTOPKGTEST_TMP"
-
-for py in $PYS; do
- echo "=== $py ==="
- $py -m pytest -v \
--k "not test_add_shapefiles_from_dict_agg \
-and not test_add_shapefiles_from_dict_pil \
-and not test_add_one_shapefile_from_cfg_agg \
-and not test_add_one_shapefile_from_cfg_pil \
-and not test_add_points_pil \
-and not test_config_file_points_and_borders_pil \
-and not test_add_cities_pil \
-and not test_add_cities_cfg_pil \
-and not test_add_cities_from_dict_pil \
-and not test_add_grid_from_dict_pil \
-and not test_eastern_shapes_pil \
-and not test_western_shapes_pil \
-and not test_no_h_scratch_pil \
-and not test_no_v_scratch_pil \
-and not test_add_cities_cfg_agg \
-and not test_add_cities_from_dict_agg" \
-${TESTDIR}
-done
View it on GitLab: https://salsa.debian.org/debian-gis-team/pycoast/-/compare/ab757d416bd675f0e1516a5cffd2790b7b83d4a3...ef8ddfad7b2a1d282f206703c4d485ebcedafbe1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pycoast/-/compare/ab757d416bd675f0e1516a5cffd2790b7b83d4a3...ef8ddfad7b2a1d282f206703c4d485ebcedafbe1
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/20230814/6201a315/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list