[Python-modules-team] Bug#938816: webtest: Python2 removal in sid/bullseye

[Steve Langasek]

Package: webtest
Followup-For: Bug #938816
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hello,

Here is a patch, based on webtest 2.0.28-1, that drops python2 support. 
This has been verified to build successfully, and has been uploaded to
Ubuntu on account of the removal of python-waitress.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru webtest-2.0.28/debian/control webtest-2.0.28/debian/control
--- webtest-2.0.28/debian/control	2017-09-29 03:52:31.000000000 -0700
+++ webtest-2.0.28/debian/control	2019-11-01 13:43:27.000000000 -0700
@@ -4,33 +4,17 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Piotr Ożarowski <piotr at debian.org>
 Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: dh-python, python-all, python3-all,
- python-setuptools, python-webob,
+Build-Depends-Indep: dh-python, python3-all,
  python3-setuptools, python3-webob,
 # docs & tests
  python3-sphinx, python3-six, python3-bs4, python3-waitress,
 # tests
 # python-unittest2, python-pyquery
 Standards-Version: 4.1.1
-X-Python-Version: >=2.6
 Homepage: http://pythonpaste.org/webtest/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/webtest.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/webtest.git
 
-Package: python-webtest
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-webob (>= 1.2),
- python-six, python-waitress (>= 0.8.5), python-bs4,
- python-paste (>= 1.7.1), python-pastedeploy
-Recommends: python-lxml, python-pyquery
-Suggests: python-webtest-doc
-Description: wraps any WSGI application and makes it easy to test
- WebTest helps you test your WSGI-based web applications. This can be any
- application that has a WSGI (Web Server Gateway Interface) interface,
- including an application written in a framework that supports WSGI (which
- includes most actively developed Python web frameworks – almost anything
- that even nominally supports WSGI should be testable).
-
 Package: python3-webtest
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3-webob,
diff -Nru webtest-2.0.28/debian/python-webtest-doc.links webtest-2.0.28/debian/python-webtest-doc.links
--- webtest-2.0.28/debian/python-webtest-doc.links	2017-09-29 03:52:16.000000000 -0700
+++ webtest-2.0.28/debian/python-webtest-doc.links	2019-11-01 13:43:27.000000000 -0700
@@ -1,4 +1,2 @@
-/usr/share/doc/python-webtest-doc/ /usr/share/doc/python-webtest/html
-/usr/share/doc/python-webtest-doc/_sources /usr/share/doc/python-webtest/rst
 /usr/share/doc/python-webtest-doc/ /usr/share/doc/python3-webtest/html
 /usr/share/doc/python-webtest-doc/_sources /usr/share/doc/python3-webtest/rst
diff -Nru webtest-2.0.28/debian/rules webtest-2.0.28/debian/rules
--- webtest-2.0.28/debian/rules	2017-09-29 03:52:31.000000000 -0700
+++ webtest-2.0.28/debian/rules	2019-11-01 13:43:27.000000000 -0700
@@ -5,7 +5,7 @@
 export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_install:
 	dh_auto_install --buildsystem=pybuild