[Git][debian-gis-team/satpy][master] 5 commits: Improve build doc rule in d/rules
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Mon Aug 14 09:14:38 BST 2023
Antonio Valentino pushed to branch master at Debian GIS Project / satpy
Commits:
6a2ecdb5 by Antonio Valentino at 2023-08-14T07:34:57+00:00
Improve build doc rule in d/rules
- - - - -
ea3cdd9a by Antonio Valentino at 2023-08-14T07:35:12+00:00
Use setuptools-scm
- - - - -
a919313e by Antonio Valentino at 2023-08-14T07:54:31+00:00
Use <!nocheck> and <!nodoc> markers in d/rules
- - - - -
2729bc96 by Antonio Valentino at 2023-08-14T08:13:01+00:00
Switch to autopkgtest-pkg-pybuild
- - - - -
6a283848 by Antonio Valentino at 2023-08-14T08:13:45+00:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
9 changed files:
- debian/changelog
- debian/clean
- debian/control
- − debian/docs
- debian/doc-base → debian/python3-satpy.doc-base
- + debian/python3-satpy.docs
- debian/rules
- − debian/tests/control
- − debian/tests/python3
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,21 @@
satpy (0.43.0-2) UNRELEASED; urgency=medium
+ [ Bas Couwenberg ]
* Team upload.
* Use execute_{before,after} instead of override in rules file.
(closes: #1046735)
+ [ Antonio Valentino ]
+ * debian/rules:
+ - Improve build doc rule.
+ - Drop the no longer necessary version file generation
+ (now setuptools-scm is used directly).
+ * devian/control:
+ - Build-repend on python3-setuptools-scm.
+ - Use <!nocheck> and <!nodoc> markers.
+ * Switch to autopkgtest-pkg-pybuild and remove the no longer
+ needed d/tests folder.
+
-- Bas Couwenberg <sebastic at debian.org> Sun, 13 Aug 2023 16:04:53 +0200
satpy (0.43.0-1) unstable; urgency=medium
=====================================
debian/clean
=====================================
@@ -1,7 +1,5 @@
.eggs
.pytest_cache/
*-info/
-doc/source/api/*rst
-doc/source/reader_table.rst
satpy/version.py
test*.mitiff
=====================================
debian/control
=====================================
@@ -2,17 +2,17 @@ Source: satpy
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,
- libjs-jquery-datatables,
- libjs-mathjax,
+ libjs-jquery-datatables <!nodoc>,
+ libjs-mathjax <!nodoc>,
pybuild-plugin-pyproject,
python3-all,
python3-appdirs,
python3-astropy,
- python3-behave,
+ python3-behave <!nocheck>,
python3-bottleneck,
python3-bs4,
python3-cloudpickle,
@@ -45,23 +45,25 @@ Build-Depends: debhelper-compat (= 13),
python3-pyproj,
python3-pyresample (>= 1.24.0),
python3-pyspectral,
- python3-pytest,
- python3-pytest-lazy-fixture,
+ python3-pytest <!nocheck>,
+ python3-pytest-lazy-fixture <!nocheck>,
python3-rasterio,
python3-requests,
python3-rioxarray,
python3-scipy,
python3-setuptools,
+ python3-setuptools-scm,
python3-skyfield,
- python3-sphinx,
- python3-sphinx-rtd-theme,
- python3-sphinxcontrib.apidoc,
+ python3-sphinx <!nodoc>,
+ python3-sphinx-rtd-theme <!nodoc>,
+ python3-sphinxcontrib.apidoc <!nodoc>,
python3-tables,
python3-tornado,
python3-trollimage,
python3-trollsched,
python3-trollsift,
python3-xarray,
+ python3-xarray-datatree,
python3-yaml,
python3-zarr
Standards-Version: 4.6.2
=====================================
debian/docs deleted
=====================================
@@ -1 +0,0 @@
-build/html
=====================================
debian/doc-base → debian/python3-satpy.doc-base
=====================================
=====================================
debian/python3-satpy.docs
=====================================
@@ -0,0 +1 @@
+.pybuild/docs/html
=====================================
debian/rules
=====================================
@@ -5,55 +5,50 @@
#export DH_VERBOSE=1
include /usr/share/dpkg/pkg-info.mk
+export SETUPTOOLS_SCM_PRETEND_VERSION=$(DEB_VERSION_UPSTREAM)
export PYBUILD_NAME=satpy
export PYBUILD_AFTER_INSTALL=rm -rf \
{destdir}/{install_dir}/benchmarks \
{destdir}/{install_dir}/dask-worker-space \
{destdir}/{install_dir}/dummy*
-export PYBUILD_TEST_ARGS=-k \
-"not test_retrieve\
- and not test_offline_retrieve\
- and not test_retrieve_all and not test_download_script\
- and not test_start_time and not test_end_time\
- and not test_mimic_TPW2_nc\
- and not TestAngleGeneration\
- and not test_get_luts\
- and not test_convert_remote_files_to_fsspec_fsfile\
- and not test_convert_remote_files_to_fsspec_filename_dict\
- and not test_convert_remote_files_to_fsspec_mixed_sources\
- and not test_get_satpos_from_satname\
- and not test_distributed\
- and not test_rayleigh_corrector\
- and not test_rayleigh_with_angles\
- and not test_float_write_with_unit_conversion \
- and not test_median" \
+export PYBUILD_TEST_ARGS=-k "\
+not test_retrieve \
+and not test_offline_retrieve \
+and not test_retrieve_all \
+and not test_download_script \
+and not test_start_time \
+and not test_end_time \
+and not test_mimic_TPW2_nc \
+and not TestAngleGeneration \
+and not test_get_luts \
+and not test_convert_remote_files_to_fsspec_fsfile \
+and not test_convert_remote_files_to_fsspec_filename_dict \
+and not test_convert_remote_files_to_fsspec_mixed_sources \
+and not test_get_satpos_from_satname \
+and not test_distributed \
+and not test_rayleigh_corrector \
+and not test_rayleigh_with_angles \
+and not test_float_write_with_unit_conversion \
+and not test_aggregate \
+and not test_median" \
--ignore=satpy/tests/reader_tests/test_insat3d_img_l1b_h5.py \
--ignore=satpy/tests/reader_tests/gms/test_gms5_vissr_l1b.py \
--ignore=satpy/tests/reader_tests/gms/test_gms5_vissr_navigation.py
+ifeq (,$(filter $(DEB_BUILD_ARCH),armhf))
+export PYBUILD_DISABLE=test
+endif
+
%:
dh $@ --with python3,numpy3,sphinxdoc --buildsystem=pybuild
-execute_before_dh_auto_configure:
- echo "version = '$(DEB_VERSION_UPSTREAM)'" > satpy/version.py
-
-execute_after_dh_auto_build: export http_proxy=127.0.0.1:9
-execute_after_dh_auto_build: export https_proxy=127.0.0.1:9
-execute_after_dh_auto_build:
+execute_after_dh_auto_build-indep: export http_proxy=127.0.0.1:9
+execute_after_dh_auto_build-indep: export https_proxy=127.0.0.1:9
+execute_after_dh_auto_build-indep:
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
PSP_CONFIG_FILE=$(CURDIR)/debian/pyspectral_dummycfg.yaml \
- PYTHONPATH=. python3 -m sphinx -N -bhtml doc/source build/html # HTML generator
- # PYTHONPATH=. python3 -m sphinx -N -bman doc/source build/man # Manpage generator
-endif
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-ifneq (,$(filter $(DEB_BUILD_ARCH),armhf))
- dh_auto_test || echo "Ignoring test failures"
-else
- dh_auto_test
-endif
+ PYTHONPATH=. python3 -m sphinx -N -E -T -b html doc/source $(CURDIR)/.pybuild/docs/html
endif
execute_after_dh_fixperms:
=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-Tests: python3
-Depends: @builddeps@, @, python3-all
-Restrictions: skippable
=====================================
debian/tests/python3 deleted
=====================================
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -efu
-
-# Skip tests on problematic architectures
-ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)"
-
-if [ "${ARCH}" = "armhf" ]
-then
- echo "Skipping tests on problematic architectures"
- exit 77
-fi
-
-PYS=${PYS:-"$(py3versions -s 2>/dev/null)"}
-
-cd "$AUTOPKGTEST_TMP"
-
-for py in $PYS; do
- echo "=== $py ==="
- $py -m pytest -v --pyargs satpy -k "not test_retrieve \
-and not test_offline_retrieve \
-and not test_retrieve_all \
-and not test_download_script \
-and not test_start_time and not test_end_time \
-and not test_mimic_TPW2_nc \
-and not TestAngleGeneration \
-and not test_get_luts \
-and not test_convert_remote_files_to_fsspec_fsfile \
-and not test_convert_remote_files_to_fsspec_filename_dict \
-and not test_convert_remote_files_to_fsspec_mixed_sources \
-and not test_get_satpos_from_satname \
-and not test_distributed \
-and not test_rayleigh_corrector \
-and not test_rayleigh_with_angles \
-and not test_float_write_with_unit_conversion \
-and not test_aggregate \
-and not test_median" \
---ignore=/usr/lib/python3/dist-packages/satpy/tests/reader_tests/test_insat3d_img_l1b_h5.py \
---ignore=/usr/lib/python3/dist-packages/satpy/tests/reader_tests/gms/test_gms5_vissr_l1b.py \
---ignore=/usr/lib/python3/dist-packages/satpy/tests/reader_tests/gms/test_gms5_vissr_navigation.py 2>&1
-done
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/a2d6a45d2cad5603cbccb9f21a7d20ea901bf524...6a2838481f545142901afd95ea98489e84f60b86
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/a2d6a45d2cad5603cbccb9f21a7d20ea901bf524...6a2838481f545142901afd95ea98489e84f60b86
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/8fdbd639/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list