Update to v2.2.0-1 and drop Py2

1 files changed, 20 insertions, 52 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 857c1132a46c..183b05b705fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,69 +1,37 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-saharaclient' 'python2-saharaclient')
-pkgver='2.1.0'
-pkgrel='1'
+pkgname=python-saharaclient
+pkgver=2.2.0
+pkgrel=1
 pkgdesc='Python client library for Sahara'
 arch=('any')
-url="http://docs.openstack.org/developer/${pkgname}/"
+url="http://docs.openstack.org/$pkgname/"
 license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
-checkdepends=('python-pbr' 'python2-pbr'
-              'python-keystoneauth1' 'python2-keystoneauth1'
-              'python-osc-lib' 'python2-osc-lib'
-              'python-oslo-log' 'python2-oslo-log'
-              'python-oslo-serialization' 'python2-oslo-serialization'
-              'python-oslo-i18n' 'python2-oslo-i18n'
-              'python-oslo-utils' 'python2-oslo-utils'
-              'python-openstackclient' 'python2-openstackclient'
-              'python-requests' 'python2-requests'
-              'python-six' 'python2-six'
-              'python-mock' 'python2-mock'
-              'python-hacking' 'python2-hacking'
-              'python-pycodestyle' 'python2-pycodestyle'
-              'python-oslotest' 'python2-oslotest'
-              'python-os-testr' 'python2-os-testr'
-              'python-requests-mock' 'python2-requests-mock'
-              'python-testrepository' 'python2-testrepository')
-source=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
-sha512sums=('f9e67e44fc3f70d6b9d2c59d7eae487ebcbc3ef5a678e4c8ef658fa0d016968a3d3793f68cc19071abc17d73b5708a671fd60bd9c01509440aa5ee55ade600ad')
+depends=('python-pbr' 'python-babel' 'python-keystoneauth1' 'python-osc-lib'
+         'python-oslo-log' 'python-oslo-serialization' 'python-oslo-i18n'
+         'python-oslo-utils' 'python-openstackclient' 'python-requests'
+         'python-six')
+checkdepends=('python-hacking' 'python-mock' 'python-oslotest' 'python-stestr'
+              'python-requests-mock')
+source=("https://github.com/openstack/$pkgname/archive/$pkgver.tar.gz")
+sha512sums=('505475e4a86d6529d07b2f2a15bc73ad63e1685b0342306809b78d3436dcb09a4148316a84be34b64a8300749429229a7ce2b58791bc9badbc215f7d10928ce4')
 
-prepare() {
-  sed -i 's/pep8/pycodestyle/g' "${srcdir}/${pkgname}-${pkgver}/saharaclient/tests/hacking/checks.py"
-  cp -a "${srcdir}/${pkgname}-${pkgver}"{,-py2}
-  export PBR_VERSION=$pkgver
-}
+export PBR_VERSION=$pkgver
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   python setup.py build
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  python2 setup.py build
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ostestr
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  ostestr2
-}
-
-package_python-saharaclient() {
-  depends=('python-pbr' 'python-keystoneauth1' 'python-osc-lib' 'python-oslo-log'
-           'python-oslo-serialization' 'python-oslo-i18n' 'python-oslo-utils'
-           'python-openstackclient' 'python-requests' 'python-six')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
+  cd $pkgname-$pkgver
+  sed -i 's/pep8/pycodestyle/g' saharaclient/tests/hacking/checks.py
+  stestr run
 }
 
-package_python2-saharaclient() {
-  depends=('python2-pbr' 'python2-keystoneauth1' 'python2-osc-lib' 'python2-oslo-log'
-           'python2-oslo-serialization' 'python2-oslo-i18n' 'python2-oslo-utils'
-           'python2-openstackclient' 'python2-requests' 'python2-six')
-  cd "${srcdir}/python-saharaclient-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: