Date: Thursday, January 30, 2020 @ 08:54:59 Author: yan12125 Revision: 560055
upgpkg: python-txaio 20.1.1-1 Modified: python-txaio/trunk/PKGBUILD Deleted: python-txaio/trunk/make-pytest-happy.patch -------------------------+ PKGBUILD | 20 ++++++------------- make-pytest-happy.patch | 47 ---------------------------------------------- 2 files changed, 7 insertions(+), 60 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-01-30 08:54:15 UTC (rev 560054) +++ PKGBUILD 2020-01-30 08:54:59 UTC (rev 560055) @@ -2,8 +2,8 @@ # Contributor: Anatol Pomozov pkgname=python-txaio -pkgver=18.8.1 -pkgrel=3 +pkgver=20.1.1 +pkgrel=1 pkgdesc='Compatibility API between asyncio/Twisted/Trollius' arch=('any') url="https://github.com/crossbario/txaio" @@ -10,11 +10,11 @@ license=('MIT') depends=('python-six') makedepends=('python-setuptools') -checkdepends=('python-pytest' 'python-mock' 'python-twisted') -source=("https://pypi.io/packages/source/t/txaio/txaio-$pkgver.tar.gz" - 'make-pytest-happy.patch') -sha512sums=('5aa0024b32211534b0c673da13b092ba08e15195b3b016bc21104618605d5c0b49096fa2795e13d9d5c4247defa1d72f903cbcc8d00a21359825224faab64b64' - 'bc78ad2ba52d8cd9eb8a2743be93b88b3e162ede50e848e16a7db60f9c0a47115cd8fa92f4151c1d8377852524c07483a18d3d38e349347538a7bde1c56afe27') +# python-tests is used here: +# https://github.com/crossbario/txaio/blob/v20.1.1/test/_asyncio_test_utils.py#L35 +checkdepends=('python-pytest' 'python-mock' 'python-twisted' 'python-tests') +source=("https://pypi.io/packages/source/t/txaio/txaio-$pkgver.tar.gz") +sha512sums=('a5a631fe9b0e648db66178991353c8e5ec6b1bf653f411dd11b1d3c2df9f205f907ea996a51b53c1722c0412bf5414929c96304e04072f4ed7991f61ea85e9a0') prepare() { # This tests whether pip can install the sdist, and is completely broken @@ -21,12 +21,6 @@ # except in their boutique setup. They won't fix it. # https://github.com/crossbario/txaio/issues/77#issuecomment-246276723 rm txaio-$pkgver/test/test_packaging.py - - # https://github.com/crossbario/txaio/issues/140 - patch -Np1 -d txaio-$pkgver <make-pytest-happy.patch - - # Fix tests on Python 3.7 (https://github.com/crossbario/txaio/issues/134) - sed -i 's/asyncio\.test_utils/test.test_asyncio.utils/' txaio-$pkgver/test/*.py } build() { Deleted: make-pytest-happy.patch =================================================================== --- make-pytest-happy.patch 2020-01-30 08:54:15 UTC (rev 560054) +++ make-pytest-happy.patch 2020-01-30 08:54:59 UTC (rev 560055) @@ -1,47 +0,0 @@ -From 9217f054b7eccc120f84e01995479125e07de59a Mon Sep 17 00:00:00 2001 -From: meejah <mee...@meejah.ca> -Date: Fri, 22 Feb 2019 12:01:46 -0700 -Subject: [PATCH] make pytest happy - ---- - test/conftest.py | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/test/conftest.py b/test/conftest.py -index 4a225c8..a3ca2d6 100644 ---- a/test/conftest.py -+++ b/test/conftest.py -@@ -25,9 +25,9 @@ def framework(request): - - try: - if request.param == 'twisted': -- return framework_tx() -+ return _notfixture_framework_tx() - elif request.param == 'asyncio': -- return framework_aio() -+ return _notfixture_framework_aio() - except ImportError: - pytest.skip() - -@@ -43,6 +43,10 @@ def framework_uninitialized(): - - @pytest.fixture - def framework_tx(): -+ return _notfixture_framework_tx() -+ -+ -+def _notfixture_framework_tx(): - try: - import txaio - from txaio import tx -@@ -56,6 +60,10 @@ def framework_tx(): - - @pytest.fixture - def framework_aio(): -+ return _notfixture_framework_aio() -+ -+ -+def _notfixture_framework_aio(): - try: - import txaio - from txaio import aio