Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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 <[email protected]> Tue, 17 Dec 2024 14:22:33 +0000

python-tinycss (0.4-6) unstable; urgency=medium

[ Debian Janitor ]
Expand Down
1 change: 1 addition & 0 deletions debian/clean
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
docs/.build/
tinycss.egg-info/SOURCES.txt
tinycss/speedups.c
9 changes: 6 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ Maintainer: Debian Python Team <[email protected]>
Uploaders: Michael Fladischer <[email protected]>,
Felix Krull <[email protected]>
Build-Depends: debhelper-compat (= 13),
dh-python,
dh-sequence-python3,
dh-sequence-sphinxdoc,
cython3,
pybuild-plugin-pyproject,
python3-all-dev,
python3-pytest <!nocheck>,
python3-pytest-cov <!nocheck>,
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
Expand Down
30 changes: 30 additions & 0 deletions debian/patches/remove-pytest-flake8-isort.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From: Colin Watson <[email protected]>
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 =
2 changes: 2 additions & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sphinx-8.0.patch
remove-pytest-flake8-isort.patch
20 changes: 20 additions & 0 deletions debian/patches/sphinx-8.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
From: Colin Watson <[email protected]>
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)}
1 change: 1 addition & 0 deletions debian/pybuild.testfiles
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tinycss/tests
14 changes: 3 additions & 11 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading