[arch-commits] Commit in python-requests/trunk (0001-Support-pytest-4.patch PKGBUILD)

[Felix Yan]

    Date: Thursday, February 20, 2020 @ 08:53:50
  Author: felixonmars
Revision: 375910

upgpkg: python-requests 2.23.0-1

Modified:
  python-requests/trunk/PKGBUILD
Deleted:
  python-requests/trunk/0001-Support-pytest-4.patch

-----------------------------+
 0001-Support-pytest-4.patch |   44 ------------------------------------------
 PKGBUILD                    |   10 ++-------
 2 files changed, 3 insertions(+), 51 deletions(-)

Deleted: 0001-Support-pytest-4.patch
===================================================================
--- 0001-Support-pytest-4.patch	2020-02-20 06:31:07 UTC (rev 375909)
+++ 0001-Support-pytest-4.patch	2020-02-20 08:53:50 UTC (rev 375910)
@@ -1,44 +0,0 @@
-From e1eee5262b86d046358c2cc1ba1f4b47da0bbc6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
-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	2020-02-20 06:31:07 UTC (rev 375909)
+++ PKGBUILD	2020-02-20 08:53:50 UTC (rev 375910)
@@ -3,8 +3,8 @@
 
 pkgbase=python-requests
 pkgname=('python-requests' 'python2-requests')
-pkgver=2.22.0
-pkgrel=4
+pkgver=2.23.0
+pkgrel=1
 pkgdesc="Python HTTP for Humans"
 arch=('any')
 url="http://python-requests.org"
@@ -13,18 +13,14 @@
              'python-urllib3' 'python2-urllib3' 'python-idna' 'python2-idna')
 checkdepends=('python-pytest-httpbin' 'python-pytest-mock' 'python-pysocks' 'python-pyopenssl')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/psf/requests/archive/v$pkgver.tar.gz"
-        "0001-Support-pytest-4.patch"
         certs.patch
         "requests-pytest-5.patch::https://github.com/psf/requests/pull/5305.patch")
-sha512sums=('1259c270e343fc860322b105904232226f26b3b363e9d102d599020fcc7b6e1d524dc6c650181ce3152caebe11d2c60045ddd9c9fc04560294caa284e209c386'
-            '36ac0f06bbeb893e4cc4108e7421de5b9c5e5bff82d5f0e227a1ebde0a5df4ca57236762b45e5025aea4724f1fc320f9f32665a57c77b958e9c05efbe317ccc1'
+sha512sums=('a8e670d928fce3531629a6d73ee6b47882f3eba47684841bfce44376781b2b9c5c97186e1750ee582b0c11fa67c983f340f95eb2a4f19042f4cbc77ae090a69c'
             '424a3bb01b23409284f6c9cd2bc22d92df31b85cfd96e1d1b16b5d68adeca670dfed4fff7977d8b10980102b0f780eacc465431021fcd661f3a17168a02a39a3'
             '560aa7d31b51ca2b59cf93cf41c2dcaa648950119653f09ebcd9be2475f5719bf6116c7043d6eb5b317da37bc9893774d46fbc22a14623314f3fd30bc8f62092')
 
 prepare() {
   cd "$srcdir"/requests-$pkgver
-  # pytest 4 support
-  patch -p1 -i ../0001-Support-pytest-4.patch
   patch -p1 -i ../requests-pytest-5.patch
   sed -e '/certifi/d' \
       -e "s/,<.*'/'/" \