[arch-commits] Commit in gunicorn/trunk (PKGBUILD gunicorn-pytest5.patch)

[Felix Yan]

    Date: Sunday, March 28, 2021 @ 12:45:17
  Author: felixonmars
Revision: 906812

upgpkg: gunicorn 20.1.0-1

Modified:
  gunicorn/trunk/PKGBUILD
Deleted:
  gunicorn/trunk/gunicorn-pytest5.patch

------------------------+
 PKGBUILD               |   10 +++----
 gunicorn-pytest5.patch |   67 -----------------------------------------------
 2 files changed, 5 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-28 12:44:33 UTC (rev 906811)
+++ PKGBUILD	2021-03-28 12:45:17 UTC (rev 906812)
@@ -4,8 +4,8 @@
 # Contributor: Vsevolod Balashov <vsevolod at balashov dot name>
 
 pkgname=gunicorn
-pkgver=20.0.4
-pkgrel=3
+pkgver=20.1.0
+pkgrel=1
 pkgdesc='WSGI HTTP Server for UNIX'
 arch=('any')
 url='https://gunicorn.org/'
@@ -14,9 +14,9 @@
 optdepends=('python-eventlet: For asynchronous request handling with eventlet.'
             'python-gevent: For asynchronous request handling with gevent.')
 checkdepends=('python-aiohttp' 'python-coverage' 'python-pytest' 'python-pytest-cov'
-              'python-pytest-runner')
+              'python-eventlet' 'python-gevent')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/benoitc/$pkgname/archive/$pkgver.tar.gz")
-sha512sums=('5a82a448e07ede9e987b14c9ae4abfda29ed80d4220d640f68dab6fb59bb4bdab3d5fc3f0689ddc36102d88a10dbd244ee90e62647acea259429e8a79f370ea4')
+sha512sums=('4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111')
 
 prepare() {
   sed -e 's/==/>=/' -e 's/,<.*$//' -i gunicorn-$pkgver/requirements_test.txt
@@ -29,7 +29,7 @@
 
 check() {
   cd gunicorn-$pkgver
-  python setup.py pytest
+  python -m pytest
 }
 
 package() {

Deleted: gunicorn-pytest5.patch
===================================================================
--- gunicorn-pytest5.patch	2021-03-28 12:44:33 UTC (rev 906811)
+++ gunicorn-pytest5.patch	2021-03-28 12:45:17 UTC (rev 906812)
@@ -1,67 +0,0 @@
-From f38f717539b1b7296720805b8ae3969c3509b9c1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Ba=C5=A1ti?= <mbasti at redhat.com>
-Date: Thu, 11 Jul 2019 19:12:16 +0200
-Subject: [PATCH] Fix pytest 5.0.0 compatibility
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-pytest.raises() returns exception info not the exception itself. They
-changed implementation of exception info, so now .value property must be
-used to get the exception instance and have proper output from str()
-method.
-
-https://github.com/pytest-dev/pytest/issues/5412
-
-Signed-off-by: Martin Bašti <mbasti at redhat.com>
----
- tests/test_util.py | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/tests/test_util.py b/tests/test_util.py
-index 3b8688a21..2494d2c54 100644
---- a/tests/test_util.py
-+++ b/tests/test_util.py
-@@ -29,9 +29,9 @@ def test_parse_address(test_input, expected):
- 
- 
- def test_parse_address_invalid():
--    with pytest.raises(RuntimeError) as err:
-+    with pytest.raises(RuntimeError) as exc_info:
-         util.parse_address('127.0.0.1:test')
--    assert "'test' is not a valid port number." in str(err)
-+    assert "'test' is not a valid port number." in str(exc_info.value)
- 
- 
- def test_http_date():
-@@ -63,24 +63,24 @@ def test_warn(capsys):
- def test_import_app():
-     assert util.import_app('support:app')
- 
--    with pytest.raises(ImportError) as err:
-+    with pytest.raises(ImportError) as exc_info:
-         util.import_app('a:app')
--    assert 'No module' in str(err)
-+    assert 'No module' in str(exc_info.value)
- 
--    with pytest.raises(AppImportError) as err:
-+    with pytest.raises(AppImportError) as exc_info:
-         util.import_app('support:wrong_app')
-     msg = "Failed to find application object 'wrong_app' in 'support'"
--    assert msg in str(err)
-+    assert msg in str(exc_info.value)
- 
- 
- def test_to_bytestring():
-     assert util.to_bytestring('test_str', 'ascii') == b'test_str'
-     assert util.to_bytestring('test_str®') == b'test_str\xc2\xae'
-     assert util.to_bytestring(b'byte_test_str') == b'byte_test_str'
--    with pytest.raises(TypeError) as err:
-+    with pytest.raises(TypeError) as exc_info:
-         util.to_bytestring(100)
-     msg = '100 is not a string'
--    assert msg in str(err)
-+    assert msg in str(exc_info.value)
- 
- 
- @pytest.mark.parametrize('test_input, expected', [