[arch-commits] Commit in python-requests/trunk (PKGBUILD)

[Jelle van der Waa]

    Date: Monday, November 29, 2021 @ 16:28:34
  Author: jelle
Revision: 429457

upgpkg: python-requests 2.26.0-2

Modified:
  python-requests/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-29 16:07:56 UTC (rev 429456)
+++ PKGBUILD	2021-11-29 16:28:34 UTC (rev 429457)
@@ -2,16 +2,18 @@
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgbase=python-requests
-pkgname=('python-requests' 'python2-requests')
+pkgname=('python-requests')
 pkgver=2.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python HTTP for Humans"
 arch=('any')
 url="http://python-requests.org"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-chardet' 'python2-chardet'
-             'python-urllib3' 'python2-urllib3' 'python-idna' 'python2-idna')
+depends=('python-urllib3' 'python-chardet' 'python-idna')
+makedepends=('python-setuptools' 'python-chardet'
+             'python-urllib3' 'python-idna')
 checkdepends=('python-pytest-httpbin' 'python-pytest-mock' 'python-pysocks' 'python-trustme')
+optdepends=('python-pysocks: SOCKS proxy support')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/psf/requests/archive/v$pkgver.tar.gz"
         certs.patch)
 sha512sums=('df7b3fbef42e600434764b2ae3906546a778f8caab0111d818adef7c747d4d58e9977ac9ae25092e1170a2cde78234e64b779ba4afd84bb2bf7dbce6efb380e9'
@@ -25,18 +27,11 @@
       -e '/charset_normalizer/d' \
       -i setup.py
   patch -p1 -i "$srcdir"/certs.patch
-
-  cd "$srcdir"
-  cp -a requests-$pkgver{,-py2}
-  find requests-$pkgver-py2 -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} +
 }
 
 build() {
   cd "$srcdir"/requests-$pkgver
   python setup.py build
-
-  cd "$srcdir"/requests-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
@@ -48,20 +43,7 @@
   pytest tests --deselect tests/test_requests.py::TestRequests::test_pyopenssl_redirect
 }
 
-package_python-requests() {
-  depends=('python-urllib3' 'python-chardet' 'python-idna')
-  optdepends=('python-pysocks: SOCKS proxy support')
-
+package() {
   cd "$srcdir"/requests-$pkgver
   python setup.py install --skip-build -O1 --root="$pkgdir"
 }
-
-package_python2-requests() {
-  depends=('python2-urllib3' 'python2-chardet' 'python2-idna')
-  optdepends=('python2-ndg-httpsclient: HTTPS requests with SNI support'
-              'python2-grequests: asynchronous requests with gevent'
-              'python2-pysocks: SOCKS proxy support')
-
-  cd "$srcdir"/requests-$pkgver-py2
-  python2 setup.py install --skip-build -O1 --root="$pkgdir"
-}