[arch-commits] Commit in python-invoke/trunk (PKGBUILD invoke-devendor.patch)

[Felix Yan]

    Date: Sunday, August 1, 2021 @ 18:29:50
  Author: felixonmars
Revision: 991989

upgpkg: python-invoke 1.6.0-1: devendor and update

Added:
  python-invoke/trunk/invoke-devendor.patch
Modified:
  python-invoke/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   17 +++++---
 invoke-devendor.patch |   94 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-01 18:23:50 UTC (rev 991988)
+++ PKGBUILD	2021-08-01 18:29:50 UTC (rev 991989)
@@ -7,24 +7,29 @@
 url="https://github.com/pyinvoke/invoke"
 license=('BSD')
 arch=('any')
-depends=('python')
+depends=('python-fluidity' 'python-lexicon' 'python-six' 'python-yaml')
 makedepends=('python-setuptools')
 checkdepends=('python-pytest-runner' 'python-mock' 'python-pytest-relaxed')
-source=("https://pypi.io/packages/source/i/invoke/invoke-$pkgver.tar.gz")
-sha512sums=('640719d576b6c655d2a1b8e2f0556b49621c846fbce26120abc818c20dc6f9445c7663b9aafe41e7e4f7f6160bd17d1678bb6912cbe13dcbaded278cc78eb824')
+source=("https://pypi.io/packages/source/i/invoke/invoke-$pkgver.tar.gz"
+        invoke-devendor.patch)
+sha512sums=('640719d576b6c655d2a1b8e2f0556b49621c846fbce26120abc818c20dc6f9445c7663b9aafe41e7e4f7f6160bd17d1678bb6912cbe13dcbaded278cc78eb824'
+            'c5e414990f7a36455ff28288f90cccd62e570775523ea307f4ed2b7cdc7b9b0c1ee2d2eb046a048843fd2f016aed0a3cf270355297a1d73119f83edf8bc37be9')
 
 prepare() {
   find invoke-$pkgver -type f -name '*.pyc' -delete
+  rm -r invoke-$pkgver/invoke/vendor
+
+  patch -d invoke-$pkgver -p1 < invoke-devendor.patch
 }
 
 build() {
-  cd "$srcdir"/invoke-$pkgver
+  cd invoke-$pkgver
   python setup.py build
 }
 
 check() {
-  cd "$srcdir"/invoke-$pkgver
-  python setup.py pytest || echo "Tests failed"
+  cd invoke-$pkgver
+  python setup.py pytest
 }
 
 package() {

Added: invoke-devendor.patch
===================================================================
--- invoke-devendor.patch	                        (rev 0)
+++ invoke-devendor.patch	2021-08-01 18:29:50 UTC (rev 991989)
@@ -0,0 +1,94 @@
+From 566d4da2a3cd103891569c79b7b0e095ce0e0fdb Mon Sep 17 00:00:00 2001
+From: Athmane Madjoudj <athmane at fedoraproject.org>
+Date: Sun, 31 Mar 2019 00:56:07 +0100
+Subject: [PATCH] Fallback to system lib if vendorized one does not exists
+
+---
+ integration/_support/respond_base.py | 5 ++++-
+ integration/_support/respond_both.py | 5 ++++-
+ integration/_support/respond_fail.py | 5 ++++-
+ integration/_util.py                 | 5 ++++-
+ tests/_util.py                       | 5 ++++-
+ tests/concurrency.py                 | 5 ++++-
+ tests/conftest.py                    | 6 +++++-
+ tests/runners.py                     | 5 ++++-
+ tests/watchers.py                    | 5 ++++-
+ 9 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/tests/_util.py b/tests/_util.py
+index a51c2bef..0ce507bb 100644
+--- a/tests/_util.py
++++ b/tests/_util.py
+@@ -8,7 +8,10 @@
+     termios = None
+ from contextlib import contextmanager
+ 
+-from invoke.vendor.six import BytesIO, b, wraps
++try:
++    from invoke.vendor.six import BytesIO, b, wraps
++except ImportError:
++    from six import BytesIO, b, wraps
+ 
+ from mock import patch, Mock
+ from pytest import skip
+diff --git a/tests/concurrency.py b/tests/concurrency.py
+index f77eed81..1cf86f39 100644
+--- a/tests/concurrency.py
++++ b/tests/concurrency.py
+@@ -1,4 +1,7 @@
+-from invoke.vendor.six.moves.queue import Queue
++try:
++    from invoke.vendor.six.moves.queue import Queue
++except ImportError:
++    from six.moves.queue import Queue
+ 
+ from invoke.util import ExceptionWrapper, ExceptionHandlingThread as EHThread
+ 
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 4fe8dbca..faf88105 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -3,7 +3,11 @@
+ import sys
+ import termios
+ 
+-from invoke.vendor.six import iteritems
++try:
++    from invoke.vendor.six import iteritems
++except ImportError:
++    from six import iteritems
++
+ import pytest
+ from mock import patch
+ 
+diff --git a/tests/runners.py b/tests/runners.py
+index abd3b4f9..259cf3c9 100644
+--- a/tests/runners.py
++++ b/tests/runners.py
+@@ -6,7 +6,10 @@
+ from io import BytesIO
+ from itertools import chain, repeat
+ 
+-from invoke.vendor.six import StringIO, b, PY2, iteritems
++try:
++    from invoke.vendor.six import StringIO, b, PY2, iteritems
++except ImportError:
++    from six import StringIO, b, PY2, iteritems
+ 
+ from pytest import raises, skip
+ from pytest_relaxed import trap
+diff --git a/tests/watchers.py b/tests/watchers.py
+index 2d02e2b7..f27a025a 100644
+--- a/tests/watchers.py
++++ b/tests/watchers.py
+@@ -1,6 +1,9 @@
+ from threading import Thread, Event
+ 
+-from invoke.vendor.six.moves.queue import Queue, Empty
++try:
++    from invoke.vendor.six.moves.queue import Queue, Empty
++except ImportError:
++    from six.moves.queue import Queue, Empty
+ 
+ from invoke import Responder, FailingResponder, ResponseNotAccepted
+