Date: Wednesday, October 17, 2018 @ 05:13:17 Author: felixonmars Revision: 394938
upgpkg: python-softlayer 5.6.0-1 Modified: python-softlayer/trunk/PKGBUILD Deleted: python-softlayer/trunk/click-7.patch ---------------+ PKGBUILD | 10 +--- click-7.patch | 138 -------------------------------------------------------- 2 files changed, 4 insertions(+), 144 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-17 05:13:06 UTC (rev 394937) +++ PKGBUILD 2018-10-17 05:13:17 UTC (rev 394938) @@ -1,7 +1,7 @@ # Maintainer: Felix Yan <felixonm...@archlinux.org> pkgname=python-softlayer -pkgver=5.5.3 +pkgver=5.6.0 pkgrel=1 pkgdesc="A library for SoftLayer's API" arch=('any') @@ -11,14 +11,12 @@ '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" - click-7.patch) -sha512sums=('65844c940c7f32366b616cf7e29410bb7a488727d011f21e2e0b6e687f27555164a4c133635d2c65368333d586bfd49d0de9afb07f932ddf0386d27872854b21' - '54395d5469fd63e5bbfd455f4e9945d4d3fe3dc5b4ff483734ba872485489fd7b883ba09602bd05ec8153d20a0d358e551877a7853670a362fdd694937f3f7ae') +source=("$pkgname-$pkgver.tar.gz::https://github.com/softlayer/softlayer-python/archive/v$pkgver.tar.gz") +sha512sums=('5a905e0c21eab73b6c44ba3f7d9c783ca5cdc621d44072277ffe638589ff421e7273d733a8c3d4e15205aef990df375dc79ce2669597a9087d6740ea6e6e0aca') prepare() { cd softlayer-python-$pkgver - patch -p1 -i ../click-7.patch + sed -i 's/==/>=/' setup.py } build() { Deleted: click-7.patch =================================================================== --- click-7.patch 2018-10-17 05:13:06 UTC (rev 394937) +++ click-7.patch 2018-10-17 05:13:17 UTC (rev 394938) @@ -1,138 +0,0 @@ -commit 6f58b94b8ded045161b12cf1fd488ca87553d3cc -Author: Felix Yan <felixonm...@archlinux.org> -Date: Wed Oct 10 06:11:47 2018 +0800 - - Update to use click 7 - -diff --git a/SoftLayer/CLI/core.py b/SoftLayer/CLI/core.py -index a02bf65a..a05ffaa5 100644 ---- a/SoftLayer/CLI/core.py -+++ b/SoftLayer/CLI/core.py -@@ -137,7 +137,7 @@ def cli(env, - - @cli.resultcallback() - @environment.pass_env --def output_diagnostics(env, verbose=0, **kwargs): -+def output_diagnostics(env, result, verbose=0, **kwargs): - """Output diagnostic information.""" - - if verbose > 0: -diff --git a/SoftLayer/CLI/vpn/ipsec/subnet/add.py b/SoftLayer/CLI/vpn/ipsec/subnet/add.py -index 438dfc5f..08d0bc5e 100644 ---- a/SoftLayer/CLI/vpn/ipsec/subnet/add.py -+++ b/SoftLayer/CLI/vpn/ipsec/subnet/add.py -@@ -18,14 +18,14 @@ from SoftLayer.CLI.exceptions import CLIHalt - type=int, - help='Subnet identifier to add') - @click.option('-t', -- '--type', - '--subnet-type', -+ '--type', - required=True, - type=click.Choice(['internal', 'remote', 'service']), - help='Subnet type to add') - @click.option('-n', -- '--network', - '--network-identifier', -+ '--network', - default=None, - type=NetworkParamType(), - help='Subnet network identifier to create') -diff --git a/SoftLayer/CLI/vpn/ipsec/subnet/remove.py b/SoftLayer/CLI/vpn/ipsec/subnet/remove.py -index 2d8b34d9..41d450a3 100644 ---- a/SoftLayer/CLI/vpn/ipsec/subnet/remove.py -+++ b/SoftLayer/CLI/vpn/ipsec/subnet/remove.py -@@ -16,8 +16,8 @@ from SoftLayer.CLI.exceptions import CLIHalt - type=int, - help='Subnet identifier to remove') - @click.option('-t', -- '--type', - '--subnet-type', -+ '--type', - required=True, - type=click.Choice(['internal', 'remote', 'service']), - help='Subnet type to add') -diff --git a/SoftLayer/CLI/vpn/ipsec/update.py b/SoftLayer/CLI/vpn/ipsec/update.py -index 68e09b0a..4056f3b8 100644 ---- a/SoftLayer/CLI/vpn/ipsec/update.py -+++ b/SoftLayer/CLI/vpn/ipsec/update.py -@@ -20,48 +20,48 @@ from SoftLayer.CLI.exceptions import CLIHalt - @click.option('--preshared-key', - default=None, - help='Preshared key value') --@click.option('--p1-auth', -- '--phase1-auth', -+@click.option('--phase1-auth', -+ '--p1-auth', - default=None, - type=click.Choice(['MD5', 'SHA1', 'SHA256']), - help='Phase 1 authentication value') --@click.option('--p1-crypto', -- '--phase1-crypto', -+@click.option('--phase1-crypto', -+ '--p1-crypto', - default=None, - type=click.Choice(['DES', '3DES', 'AES128', 'AES192', 'AES256']), - help='Phase 1 encryption value') --@click.option('--p1-dh', -- '--phase1-dh', -+@click.option('--phase1-dh', -+ '--p1-dh', - default=None, - type=click.Choice(['0', '1', '2', '5']), - help='Phase 1 diffie hellman group value') --@click.option('--p1-key-ttl', -- '--phase1-key-ttl', -+@click.option('--phase1-key-ttl', -+ '--p1-key-ttl', - default=None, - type=click.IntRange(120, 172800), - help='Phase 1 key life value') --@click.option('--p2-auth', -- '--phase2-auth', -+@click.option('--phase2-auth', -+ '--p2-auth', - default=None, - type=click.Choice(['MD5', 'SHA1', 'SHA256']), - help='Phase 2 authentication value') --@click.option('--p2-crypto', -- '--phase2-crypto', -+@click.option('--phase2-crypto', -+ '--p2-crypto', - default=None, - type=click.Choice(['DES', '3DES', 'AES128', 'AES192', 'AES256']), - help='Phase 2 encryption value') --@click.option('--p2-dh', -- '--phase2-dh', -+@click.option('--phase2-dh', -+ '--p2-dh', - default=None, - type=click.Choice(['0', '1', '2', '5']), - help='Phase 2 diffie hellman group value') --@click.option('--p2-forward-secrecy', -- '--phase2-forward-secrecy', -+@click.option('--phase2-forward-secrecy', -+ '--p2-forward-secrecy', - default=None, - type=click.IntRange(0, 1), - help='Phase 2 perfect forward secrecy value') --@click.option('--p2-key-ttl', -- '--phase2-key-ttl', -+@click.option('--phase2-key-ttl', -+ '--p2-key-ttl', - default=None, - type=click.IntRange(120, 172800), - help='Phase 2 key life value') -diff --git a/setup.py b/setup.py -index b0d08fc1..1cca86a2 100644 ---- a/setup.py -+++ b/setup.py -@@ -32,7 +32,7 @@ setup( - install_requires=[ - 'six >= 1.7.0', - 'ptable >= 0.9.2', -- 'click >= 5, < 7', -+ 'click >= 7', - 'requests >= 2.18.4', - 'prompt_toolkit >= 0.53', - 'pygments >= 2.0.0',