diff -Nru requests-2.22.0/debian/changelog requests-2.22.0/debian/changelog --- requests-2.22.0/debian/changelog 2019-12-17 12:53:37.000000000 +0000 +++ requests-2.22.0/debian/changelog 2020-04-23 02:33:21.000000000 +0000 @@ -1,3 +1,9 @@ +requests (2.22.0-2ubuntu1) focal; urgency=medium + + * Drop python2 support, cherry-picked from Debian. + + -- Steve Langasek Wed, 22 Apr 2020 19:33:21 -0700 + requests (2.22.0-2build1) focal; urgency=medium * No-change rebuild to generate dependencies on python2. diff -Nru requests-2.22.0/debian/control requests-2.22.0/debian/control --- requests-2.22.0/debian/control 2019-12-05 02:09:13.000000000 +0000 +++ requests-2.22.0/debian/control 2020-04-23 02:33:21.000000000 +0000 @@ -1,20 +1,18 @@ Source: requests -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Daniele Tricoli Section: python Priority: optional Build-Depends: debhelper-compat (= 12), dh-python, - python-all (>= 2.7), - python-certifi, - python-chardet (>= 3.0.2), python-chardet (<< 3.1.0), - python-setuptools, - python-urllib3 (>= 1.21.1), python-urllib3 (<< 1.26), python3-all, python3-certifi, python3-chardet (>= 3.0.2), python3-chardet (<< 3.1.0), + python3-pygments, python3-setuptools, + python3-sphinx (>= 1.3), python3-urllib3 (>= 1.21.1), python3-urllib3 (<< 1.26), Standards-Version: 4.4.1 Homepage: http://python-requests.org @@ -22,40 +20,6 @@ Vcs-Browser: https://salsa.debian.org/python-team/modules/requests Testsuite: autopkgtest-pkg-python -Package: python-requests -Architecture: all -Depends: - ${misc:Depends}, - ${python:Depends}, - ca-certificates, - python-certifi, - python-chardet (>= 3.0.2), python-chardet (<< 3.1.0), - python-urllib3 (>= 1.21.1), python-urllib3 (<< 1.26) -Suggests: - python-cryptography, - python-idna (>= 2.5), - python-openssl, - python-socks -Breaks: httpie (<< 0.9.2) -Description: elegant and simple HTTP library for Python2, built for human beings - Requests allow you to send HTTP/1.1 requests. You can add headers, form data, - multipart files, and parameters with simple Python dictionaries, and access - the response data in the same way. It's powered by httplib and urllib3, but - it does all the hard work and crazy hacks for you. - . - Features - . - - International Domains and URLs - - Keep-Alive & Connection Pooling - - Sessions with Cookie Persistence - - Browser-style SSL Verification - - Basic/Digest Authentication - - Elegant Key/Value Cookies - - Automatic Decompression - - Unicode Response Bodies - - Multipart File Uploads - - Connection Timeouts - Package: python3-requests Architecture: all Depends: diff -Nru requests-2.22.0/debian/python-requests.pyremove requests-2.22.0/debian/python-requests.pyremove --- requests-2.22.0/debian/python-requests.pyremove 2019-12-05 02:09:13.000000000 +0000 +++ requests-2.22.0/debian/python-requests.pyremove 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -requests/packages/chardet -requests/packages/urllib3 diff -Nru requests-2.22.0/debian/rules requests-2.22.0/debian/rules --- requests-2.22.0/debian/rules 2019-12-05 02:09:13.000000000 +0000 +++ requests-2.22.0/debian/rules 2020-04-23 02:33:21.000000000 +0000 @@ -3,7 +3,7 @@ export PYBUILD_NAME=requests %: - dh $@ --with python2,python3 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild # The test suite is disabled. # Test requires fixed version of pytest-httpbin and