diff -Nru html5lib-1.0.1/debian/changelog html5lib-1.0.1/debian/changelog --- html5lib-1.0.1/debian/changelog 2020-02-15 02:22:52.000000000 +0000 +++ html5lib-1.0.1/debian/changelog 2020-04-13 16:09:12.000000000 +0000 @@ -1,3 +1,17 @@ +html5lib (1.0.1-3) unstable; urgency=medium + + [ Stefano Rivera ] + * Use pybuild's pytest runner. + * Bump Standards-Version to 4.5.0, no changes needed. + * Bump debhelper compat to 12. + * Declare Rules-Requires-Root: no. + + [ Sandro Tosi ] + * Add myself to uploaders + * Drop python2 support; Closes: #936709 + + -- Sandro Tosi Mon, 13 Apr 2020 12:09:12 -0400 + html5lib (1.0.1-2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru html5lib-1.0.1/debian/control html5lib-1.0.1/debian/control --- html5lib-1.0.1/debian/control 2020-02-15 02:22:52.000000000 +0000 +++ html5lib-1.0.1/debian/control 2020-04-13 16:09:12.000000000 +0000 @@ -2,18 +2,9 @@ Section: python Priority: optional Maintainer: Debian Python Modules Team -Uploaders: Barry Warsaw , -Build-Depends: debhelper-compat (= 9), +Uploaders: Barry Warsaw , Sandro Tosi +Build-Depends: debhelper-compat (= 12), dh-python, - python-all (>= 2.6.6-3~), - python-genshi, - python-lxml, - python-mock, - python-pytest, - python-pytest-expect, - python-setuptools, - python-six, - python-webencodings, python3-all, python3-genshi, python3-lxml, @@ -26,21 +17,8 @@ Vcs-Git: https://salsa.debian.org/python-team/modules/html5lib.git Vcs-Browser: https://salsa.debian.org/python-team/modules/html5lib Homepage: https://github.com/html5lib/html5lib-python -Standards-Version: 3.9.8 - -Package: python-html5lib -Architecture: all -Depends: ${misc:Depends}, - ${python:Depends}, -Suggests: python-chardet, - python-genshi, - python-lxml, -Description: HTML parser/tokenizer based on the WHATWG HTML5 specification - html5lib is a pure-python library for parsing HTML. It is designed to - conform to the HTML 5 specification, which has formalized the error handling - algorithms of popular web browsers. - . - This package contains the Python 2 version of html5lib. +Standards-Version: 4.5.0 +Rules-Requires-Root: no Package: python3-html5lib Architecture: all diff -Nru html5lib-1.0.1/debian/rules html5lib-1.0.1/debian/rules --- html5lib-1.0.1/debian/rules 2020-02-15 02:22:52.000000000 +0000 +++ html5lib-1.0.1/debian/rules 2020-04-13 16:09:12.000000000 +0000 @@ -1,27 +1,11 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 -#export DH_OPTIONS=-v -#export PYBUILD_VERBOSE=1 -#export NOSE_VERBOSE=2 - export PYBUILD_NAME=html5lib +export PYBUILD_TEST_PYTEST=1 +export PYBUILD_TEST_ARGS={dir} %: - dh $@ --with python2,python3 --buildsystem=pybuild - -# This might have been used, but we'll conform instead to upstream docs, -# mentioning running nosetests. -#export PYBUILD_TEST_NOSE=1 -override_dh_auto_test: - # First, Python 2's nosetests - PYBUILD_DISABLE_python3=test \ - PYBUILD_SYSTEM=custom \ - PYBUILD_TEST_ARGS="py.test" dh_auto_test --buildsystem=pybuild - # Then for Python 3 : - PYBUILD_DISABLE_python2=test \ - PYBUILD_SYSTEM=custom \ - PYBUILD_TEST_ARGS="py.test-3" dh_auto_test --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild override_dh_installchangelogs: dh_installchangelogs CHANGES.rst