Date: Friday, August 17, 2018 @ 06:49:30 Author: felixonmars Revision: 372152
upgpkg: python-softlayer 5.5.1-1 Added: python-softlayer/trunk/py37.patch Modified: python-softlayer/trunk/PKGBUILD ------------+ PKGBUILD | 54 +++++++++++++++++------------------------------------- py37.patch | 22 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-17 06:47:35 UTC (rev 372151) +++ PKGBUILD 2018-08-17 06:49:30 UTC (rev 372152) @@ -1,61 +1,41 @@ # $Id$ # Maintainer: Felix Yan <[email protected]> -pkgbase=python-softlayer -pkgname=('python-softlayer' 'python2-softlayer') -pkgver=5.4.4 -pkgrel=2 +pkgname=python-softlayer +pkgver=5.5.1 +pkgrel=1 pkgdesc="A library for SoftLayer's API" arch=('any') license=('MIT') url='https://github.com/softlayer/softlayer-python' -makedepends=('python-setuptools' 'python2-setuptools' 'python-prettytable' 'python2-prettytable' - 'python-click' 'python2-click' 'python-requests' 'python2-requests' - 'python-prompt_toolkit' 'python2-prompt_toolkit' 'python-pygments' 'python2-pygments') -checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-mock' 'python2-mock' - 'python-testtools' 'python2-testtools') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/softlayer/softlayer-python/archive/v$pkgver.tar.gz";) -sha512sums=('b82cdf202a18e4cfed906d4bb2944235f61e2a19592b4ebbbb18b56f281f1007889e785f46763043a67cddfb15be3a1dd45cb13348dbfb5239a09cbbc202785e') +depends=('python-six' 'python-ptable' 'python-click' 'python-requests' 'python-prompt_toolkit' + 'python-pygments' 'python-urllib3') +makedepends=('python-setuptools') +checkdepends=('python-pytest-runner' 'python-mock' 'python-testtools') +source=("$pkgname-$pkgver.tar.gz::https://github.com/softlayer/softlayer-python/archive/v$pkgver.tar.gz"; + py37.patch) +sha512sums=('63ba7de5e0cb2fb9d055f9b25caf33011c4c12efb2a7fa69eca911f43bc58874d13a6fa0b9188d9eb208dde01cecf5123bb989848adfa0154a6c41d52775a897' + '1174e16cc71eb314e9ce06ce52cad5449c963e6bf5c71e199cf8893ada4d2c7d0d2a01e8025a21e133980100dd513f9a955481400b62f80f13122e94ebd315f5') -prepare() { - cp -a softlayer-python-$pkgver{,-py2} +prepare() { + cd softlayer-python-$pkgver + patch -p1 -i ../py37.patch } build() { - cd "$srcdir"/softlayer-python-$pkgver + cd softlayer-python-$pkgver python setup.py build - - cd "$srcdir"/softlayer-python-$pkgver-py2 - python2 setup.py build } check() { - cd "$srcdir"/softlayer-python-$pkgver + cd softlayer-python-$pkgver python setup.py pytest - - cd "$srcdir"/softlayer-python-$pkgver-py2 - python2 setup.py pytest } -package_python-softlayer() { - depends=('python-setuptools' 'python-prettytable' 'python-click' 'python-requests' - 'python-prompt_toolkit' 'python-pygments') - +package() { cd softlayer-python-$pkgver python setup.py install --root="$pkgdir" --optimize=1 install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -package_python2-softlayer() { - depends=('python2-setuptools' 'python2-prettytable' 'python2-click' 'python2-requests' - 'python2-prompt_toolkit' 'python2-pygments') - - cd softlayer-python-$pkgver-py2 - python2 setup.py install --root="$pkgdir" --optimize=1 - install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - - mv "$pkgdir"/usr/bin/sl{,2} - mv "$pkgdir"/usr/bin/slcli{,2} -} - # vim:set ts=2 sw=2 et: Added: py37.patch =================================================================== --- py37.patch (rev 0) +++ py37.patch 2018-08-17 06:49:30 UTC (rev 372152) @@ -0,0 +1,22 @@ +diff --git a/SoftLayer/API.py b/SoftLayer/API.py +index 3fbab72b..913752ce 100644 +--- a/SoftLayer/API.py ++++ b/SoftLayer/API.py +@@ -298,7 +298,7 @@ class BaseClient(object): + results = transports.SoftLayerListResult(results, len(results)) + else: + yield results +- raise StopIteration ++ return + + for item in results: + yield item +@@ -313,7 +313,7 @@ class BaseClient(object): + + offset += limit + +- raise StopIteration ++ return + + def __repr__(self): + return "Client(transport=%r, auth=%r)" % (self.transport, self.auth)
