Date: Thursday, May 16, 2019 @ 18:48:22 Author: felixonmars Revision: 353473
upgpkg: python-requests 2.22.0-1 Added: python-requests/trunk/0001-Support-pytest-4.patch Modified: python-requests/trunk/PKGBUILD -----------------------------+ 0001-Support-pytest-4.patch | 44 ++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 17 +++++++++++----- 2 files changed, 56 insertions(+), 5 deletions(-) Added: 0001-Support-pytest-4.patch =================================================================== --- 0001-Support-pytest-4.patch (rev 0) +++ 0001-Support-pytest-4.patch 2019-05-16 18:48:22 UTC (rev 353473) @@ -0,0 +1,44 @@ +From e1eee5262b86d046358c2cc1ba1f4b47da0bbc6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]> +Date: Mon, 8 Apr 2019 18:04:22 +0200 +Subject: [PATCH] Support pytest 4 + +Fixes https://github.com/kennethreitz/requests/issues/5048 + +See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize + +(cherry picked from commit 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0) +--- + setup.py | 2 +- + tests/test_utils.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 10ce2c62..c26616df 100755 +--- a/setup.py ++++ b/setup.py +@@ -54,7 +54,7 @@ test_requirements = [ + 'pytest-mock', + 'pytest-xdist', + 'PySocks>=1.5.6, !=1.5.7', +- 'pytest>=2.8.0' ++ 'pytest>=3' + ] + + about = {} +diff --git a/tests/test_utils.py b/tests/test_utils.py +index 59b0b0ef..62c51494 100644 +--- a/tests/test_utils.py ++++ b/tests/test_utils.py +@@ -33,7 +33,8 @@ class TestSuperLen: + 'stream, value', ( + (StringIO.StringIO, 'Test'), + (BytesIO, b'Test'), +- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')), ++ pytest.param(cStringIO, 'Test', ++ marks=pytest.mark.skipif('cStringIO is None')), + )) + def test_io_streams(self, stream, value): + """Ensures that we properly deal with different kinds of IO streams.""" +-- +2.21.0 Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-16 17:44:11 UTC (rev 353472) +++ PKGBUILD 2019-05-16 18:48:22 UTC (rev 353473) @@ -3,7 +3,7 @@ pkgbase=python-requests pkgname=('python-requests' 'python2-requests') -pkgver=2.21.0 +pkgver=2.22.0 pkgrel=1 pkgdesc="Python HTTP for Humans" arch=('any') @@ -12,14 +12,19 @@ makedepends=('python-setuptools' 'python2-setuptools' 'python-chardet' 'python2-chardet' 'python-urllib3' 'python2-urllib3' 'python-idna' 'python2-idna') checkdepends=('python-pytest-httpbin' 'python2-pytest-httpbin' 'python-pytest-mock' - 'python2-pytest-mock' 'python-pysocks' 'python2-pysocks') + 'python2-pytest-mock' 'python-pysocks' 'python2-pysocks' 'python-pyopenssl' + 'python2-pyopenssl') source=("$pkgbase-$pkgver.tar.gz::https://github.com/kennethreitz/requests/archive/v$pkgver.tar.gz"; + "0001-Support-pytest-4.patch" certs.patch) -sha512sums=('934c329e6631ec6089577c49651b73265f0c3f0829b9151e1463dea905f35820a03ec3b0ee6a2ab2292d213b715f0b2348110392d60f55ea1cbe4b24fca4f890' +sha512sums=('1259c270e343fc860322b105904232226f26b3b363e9d102d599020fcc7b6e1d524dc6c650181ce3152caebe11d2c60045ddd9c9fc04560294caa284e209c386' + '36ac0f06bbeb893e4cc4108e7421de5b9c5e5bff82d5f0e227a1ebde0a5df4ca57236762b45e5025aea4724f1fc320f9f32665a57c77b958e9c05efbe317ccc1' '424a3bb01b23409284f6c9cd2bc22d92df31b85cfd96e1d1b16b5d68adeca670dfed4fff7977d8b10980102b0f780eacc465431021fcd661f3a17168a02a39a3') prepare() { cd "$srcdir"/requests-$pkgver + # pytest 4 support + patch -p1 -i ../0001-Support-pytest-4.patch sed -e '/certifi/d' \ -e "s/,<.*'/'/" \ -i setup.py @@ -39,11 +44,13 @@ } check() { + # Seems to be a problem about pytest-httpbin + cd "$srcdir"/requests-$pkgver - py.test tests + py.test tests -k "not test_https_warnings" cd "$srcdir"/requests-$pkgver-py2 - py.test2 tests + py.test2 tests -k "not test_https_warnings" } package_python-requests() {
