Date: Tuesday, January 24, 2023 @ 21:41:36 Author: arojas Revision: 1388142
upgpkg: python-invoke 2.0.0-1: Update to 2.0.0 Modified: python-invoke/trunk/PKGBUILD Deleted: python-invoke/trunk/invoke-devendor.patch -----------------------+ PKGBUILD | 23 ++++------- invoke-devendor.patch | 94 ------------------------------------------------ 2 files changed, 9 insertions(+), 108 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-24 21:36:45 UTC (rev 1388141) +++ PKGBUILD 2023-01-24 21:41:36 UTC (rev 1388142) @@ -1,39 +1,34 @@ # Maintainer: Felix Yan <[email protected]> pkgname=python-invoke -pkgver=1.7.3 +pkgver=2.0.0 pkgrel=1 pkgdesc="Pythonic task execution" url="https://github.com/pyinvoke/invoke"; license=('BSD') arch=('any') -depends=('python-fluidity' 'python-lexicon' 'python-six' 'python-yaml') -makedepends=('python-setuptools') -checkdepends=('python-pytest' 'python-mock' 'python-pytest-relaxed') -source=("https://pypi.io/packages/source/i/invoke/invoke-$pkgver.tar.gz"; - invoke-devendor.patch) -sha512sums=('180ba1e5e06839724c9fe565b44ddd885bd8c6bb1b04f6d0f30de0450b687f52e4fccac85939fe1f23dee1ca61fde9b2a0d8aa8ffa59b292e0e5dc21eb8d6280' - 'c5e414990f7a36455ff28288f90cccd62e570775523ea307f4ed2b7cdc7b9b0c1ee2d2eb046a048843fd2f016aed0a3cf270355297a1d73119f83edf8bc37be9') +depends=('python-fluidity' 'python-lexicon' 'python-yaml') +makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel') +checkdepends=('python-pytest' 'python-pytest-relaxed' 'python-icecream') +source=("https://pypi.io/packages/source/i/invoke/invoke-$pkgver.tar.gz";) +sha512sums=('40621d0ca217f51f6a4bfdea3704cfd5e5ae97305b43ecae863d0bd4a485bb44a402e342f8e613b5b67882c398518982f13470a99174fa2756b1f9c22a3f4656') 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 invoke-$pkgver - python setup.py build + python -m build --wheel --no-isolation } check() { cd invoke-$pkgver - PYTHONPATH="$PWD"/build/lib pytest tests + PYTHONPATH="$PWD"/build/lib pytest -s tests -k 'not pty' } package() { cd invoke-$pkgver - python setup.py install --root="$pkgdir" --optimize=1 + python -m installer --destdir="$pkgdir" dist/*.whl install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Deleted: invoke-devendor.patch =================================================================== --- invoke-devendor.patch 2023-01-24 21:36:45 UTC (rev 1388141) +++ invoke-devendor.patch 2023-01-24 21:41:36 UTC (rev 1388142) @@ -1,94 +0,0 @@ -From 566d4da2a3cd103891569c79b7b0e095ce0e0fdb Mon Sep 17 00:00:00 2001 -From: Athmane Madjoudj <[email protected]> -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 -
