diff --git a/debian/changelog b/debian/changelog index eee7687..33b3d85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +python-tinycss (0.4-8) unstable; urgency=medium + + * Team upload. + * Drop build-dependency on python3-pytest-flake8 (see #1068502). + + -- Colin Watson Sun, 23 Mar 2025 21:03:59 +0000 + +python-tinycss (0.4-7) unstable; urgency=medium + + * Team upload. + * Fix documentation build for Sphinx 8.0 (closes: #1090163). + * Use pybuild-plugin-pyproject. + * Run tests during build. + * Enable autopkgtest-pkg-pybuild. + * Use dh-sequence-python3 and dh-sequence-sphinxdoc. + * Simplify some debhelper overrides. + + -- Colin Watson Tue, 17 Dec 2024 14:22:33 +0000 + python-tinycss (0.4-6) unstable; urgency=medium [ Debian Janitor ] diff --git a/debian/clean b/debian/clean index a28f985..376bec7 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1,3 @@ +docs/.build/ tinycss.egg-info/SOURCES.txt tinycss/speedups.c diff --git a/debian/control b/debian/control index f482110..52bcccc 100644 --- a/debian/control +++ b/debian/control @@ -5,17 +5,20 @@ Maintainer: Debian Python Team Uploaders: Michael Fladischer , Felix Krull Build-Depends: debhelper-compat (= 13), - dh-python, + dh-sequence-python3, + dh-sequence-sphinxdoc, cython3, + pybuild-plugin-pyproject, python3-all-dev, + python3-pytest , + python3-pytest-cov , python3-setuptools, python3-sphinx Standards-Version: 3.9.8 Homepage: https://github.com/Kozea/tinycss Vcs-Browser: https://salsa.debian.org/python-team/packages/python-tinycss Vcs-Git: https://salsa.debian.org/python-team/packages/python-tinycss.git - - +Testsuite: autopkgtest-pkg-pybuild Package: python3-tinycss Architecture: any diff --git a/debian/patches/remove-pytest-flake8-isort.patch b/debian/patches/remove-pytest-flake8-isort.patch new file mode 100644 index 0000000..0967fd3 --- /dev/null +++ b/debian/patches/remove-pytest-flake8-isort.patch @@ -0,0 +1,30 @@ +From: Colin Watson +Date: Tue, 17 Dec 2024 14:09:59 +0000 +Subject: Remove pytest flake8 and isort configuration + +`pytest-isort` isn't currently packaged in Debian, and running +`pytest-flake8` as a downstream distributor is inconvenient. + +Last-Update: 2024-12-17 +--- + setup.cfg | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index 2c35592..5c4105e 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -9,12 +9,8 @@ upload-dir = docs/_build/html + test = pytest + + [tool:pytest] +-addopts = --flake8 --isort --cov --ignore=test/cairosvg_reference ++addopts = --cov --ignore=test/cairosvg_reference + norecursedirs = dist .cache .git build *.egg-info .eggs venv cairosvg_reference +-flake8-ignore = docs/conf.py ALL +-isort_ignore = +- docs/conf.py +- setup.py + + [egg_info] + tag_build = diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..184d2e3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +sphinx-8.0.patch +remove-pytest-flake8-isort.patch diff --git a/debian/patches/sphinx-8.0.patch b/debian/patches/sphinx-8.0.patch new file mode 100644 index 0000000..1519d3d --- /dev/null +++ b/debian/patches/sphinx-8.0.patch @@ -0,0 +1,20 @@ +From: Colin Watson +Date: Tue, 17 Dec 2024 14:00:23 +0000 +Subject: Fix documentation build for Sphinx 8.0 + +Bug-Debian: https://bugs.debian.org/1090163 +Last-Update: 2024-12-17 +--- + docs/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/conf.py b/docs/conf.py +index fa7da0a..609e398 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -249,4 +249,4 @@ texinfo_documents = [ + + + # Example configuration for intersphinx: refer to the Python standard library. +-intersphinx_mapping = {'http://docs.python.org/': None} ++intersphinx_mapping = {'python': ('http://docs.python.org/', None)} diff --git a/debian/pybuild.testfiles b/debian/pybuild.testfiles new file mode 100644 index 0000000..5f835d7 --- /dev/null +++ b/debian/pybuild.testfiles @@ -0,0 +1 @@ +tinycss/tests diff --git a/debian/rules b/debian/rules index 23cf057..ce1732b 100755 --- a/debian/rules +++ b/debian/rules @@ -4,20 +4,12 @@ #export DH_VERBOSE=1 export PYBUILD_NAME=tinycss -# Disable tests because not all dependencies have been packaged yet: -# * pytest-flake8 -# * pytest isort -export PYBUILD_DISABLE=test +export PYBUILD_TEST_ARGS=tests export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ --with python3,sphinxdoc --buildsystem=pybuild + dh $@ --buildsystem=pybuild -override_dh_auto_build: - dh_auto_build +execute_after_dh_auto_build: PYTHONPATH=. python3 -m sphinx -b html -d docs/.build/.doctrees -N docs docs/.build/html - -override_dh_clean: - rm -rf docs/.build - dh_clean